Index: Mk/bsd.sites.mk
===================================================================
--- Mk/bsd.sites.mk	(revision 401584)
+++ Mk/bsd.sites.mk	(working copy)
@@ -518,6 +518,7 @@
 #                 Using the name of a branch here is incorrect. It is
 #                 possible to do GH_TAGNAME= GIT_HASH to do a snapshot.
 #                 default: ${DISTVERSION}
+# GH_TUPLE      - above shortened to account:project:tagname[:group]
 #
 .if defined(USE_GITHUB)
 .  if defined(GH_TAGNAME) && ${GH_TAGNAME} == master
@@ -525,6 +526,11 @@
 		Must use a tag or commit hash so the upstream does \
 		not "reroll" as soon as the branch is updated
 .  endif
+.  if defined(GH_TUPLE)
+GH_ACCOUNT+=	${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\1\4@}
+GH_PROJECT+=	${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\2\4@}
+GH_TAGNAME+=	${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\3\4@}
+.  endif
 # We are cheating and using backend URLS for Github here. See ports/194898
 # comment #15 for explanation as to why and how to deal with it if it breaks.
 MASTER_SITE_GITHUB+=		https://codeload.github.com/%SUBDIR%