Index: bsd.port.mk
===================================================================
--- bsd.port.mk	(revision 430373)
+++ bsd.port.mk	(working copy)
@@ -1286,10 +1286,14 @@
 PKGVERSION=	${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
 PKGNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
 DISTVERSIONFULL=	${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
-.if defined(USE_GITHUB) && empty(MASTER_SITES:MGHC) && empty(DISTNAME) && empty(USE_GITHUB:Mnodefault)
+.if defined(USE_GITHUB) && empty(MASTER_SITES:MGHA) && empty(MASTER_SITES:MGHC) && empty(DISTNAME) && empty(USE_GITHUB:Mnodefault)
 _GITHUB_MUST_SET_DISTNAME=		yes
 .else
+. if !empty(MASTER_SITES:MGHA)
+DISTNAME?=	${DISTVERSIONFULL}
+. else
 DISTNAME?=	${PORTNAME}-${DISTVERSIONFULL}
+. endif
 .endif
 
 INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
Index: bsd.sites.mk
===================================================================
--- bsd.sites.mk	(revision 430373)
+++ bsd.sites.mk	(working copy)
@@ -405,8 +405,10 @@
 # comment #15 for explanation as to why and how to deal with it if it breaks.
 MASTER_SITE_GITHUB+=		https://codeload.github.com/%SUBDIR%
 MASTER_SITE_GITHUB_CLOUD+=	https://cloud.github.com/downloads/%SUBDIR%
+MASTER_SITE_GITHUB_ARCHIVE+=	https://github.com/%SUBDIR%
 
-.  if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && !${USE_GITHUB:Mnodefault}
+.  if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && \
+    !${MASTER_SITES:MGHA} && !${USE_GITHUB:Mnodefault}
 MASTER_SITES+=	GH
 .  endif
 GH_ACCOUNT_DEFAULT=	${PORTNAME}
@@ -1269,6 +1271,7 @@
 MASTER_SITES_ABBREVS=	CPAN:PERL_CPAN \
 			GH:GITHUB \
 			GHC:GITHUB_CLOUD \
+			GHA:GITHUB_ARCHIVE \
 			LODEV:LIBREOFFICE_DEV \
 			NL:NETLIB \
 			RG:RUBYGEMS \
@@ -1287,6 +1290,7 @@
 			GIMP:${PORTNAME}/${PORTVERSION:R}/ \
 			GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/ \
 			GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \
+			GITHUB_ARCHIVE:${GH_ACCOUNT}/${GH_PROJECT}/archive/ \
 			GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
 			GNU:${PORTNAME} \
 			GNUPG:${PORTNAME} \