Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1534,7 +1534,11 @@
 
 WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
 .if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB)
+.  if defined(GH_COMMIT)
 WRKSRC?=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
+.  else
+WRKSRC?=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
+.  endif
 .endif
 .if defined(NO_WRKSUBDIR)
 WRKSRC?=		${WRKDIR}
Index: Mk/bsd.sites.mk
===================================================================
--- Mk/bsd.sites.mk
+++ Mk/bsd.sites.mk
@@ -513,20 +513,27 @@
 #
 # GH_COMMIT     - first 7 digits of the commit that generated GH_TAGNAME
 #                 (man git-describe(1))
-#                 default: not set, mandatory
+#                 if this is not set, archive corresponding to tag is fetched
+#                 default: not set
 #
 .if defined(USE_GITHUB)
-.if defined(GH_TAGNAME) && ${GH_TAGNAME} == master
+.  if defined(GH_TAGNAME) && ${GH_TAGNAME} == master
 IGNORE?=	Using master as GH_TAGNAME is invalid. \
 		Must use a tag or commit hash so the upstream does \
 		not "reroll" as soon as the branch is updated
-.endif
-MASTER_SITE_GITHUB+=		https://codeload.github.com/%SUBDIR% \
-				http://codeload.github.com/%SUBDIR%
+.  endif
+MASTER_SITE_GITHUB+=		https://codeload.github.com/%SUBDIR%
+MASTER_SITE_GITHUB_LEGACY+=	https://codeload.github.com/%SUBDIR%
 MASTER_SITE_GITHUB_CLOUD+=	http://cloud.github.com/downloads/%SUBDIR%
-.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC}
-MASTER_SITES+=	GH GHC
-.endif
+.  if defined(GH_COMMIT)
+.    if !defined(MASTER_SITES) || !${MASTER_SITES:MGHL}
+MASTER_SITES+=	GHL
+.    endif
+.  else
+.    if !defined(MASTER_SITES) || !${MASTER_SITES:MGH}
+MASTER_SITES+=	GH
+.    endif
+.  endif
 GH_PROJECT?=	${PORTNAME}
 GH_TAGNAME?=	${DISTVERSION}
 .endif
@@ -1471,6 +1478,7 @@
 MASTER_SITES_ABBREVS=	CPAN:PERL_CPAN \
 			GH:GITHUB \
 			GHC:GITHUB_CLOUD \
+			GHL:GITHUB_LEGACY \
 			NL:NETLIB \
 			SF:SOURCEFORGE \
 			SFJP:SOURCEFORGE_JP \
@@ -1483,8 +1491,9 @@
 			CSME:myports \
 			DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
 			GCC:releases/${DISTNAME} \
-			GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/ \
+			GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/ \
 			GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \
+			GITHUB_LEGACY:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/ \
 			GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
 			GNU:${PORTNAME} \
 			HORDE:${PORTNAME} \