diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 6e4aebda2cfc..5e669cdf33e8 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -3,11 +3,9 @@
 
 PORTNAME=	irrd
 PORTVERSION=	2.3.10
+DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/irrdnet/irrd-legacy/archive/
-DISTNAME=	v${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Internet Routing Registry database server
@@ -17,12 +15,16 @@ LICENSE_FILE=	${WRKDIR}/${PORTNAME}-legacy-${PORTVERSION}/COPYRIGHT
 
 RUN_DEPENDS=	wget:ftp/wget
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-legacy-${PORTVERSION}/src
+WRKSRC_SUBDIR=	src
 
 IRRD_CONFDIR=	${PREFIX}/etc
 
 USES=		shebangfix
 USE_RC_SUBR=	irrd
+USE_GITHUB=	yes
+GH_ACCOUNT=	irrdnet
+GH_PROJECT=	irrd-legacy
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	YACC="${YACC}"
 MAKE_JOBS_UNSAFE=	yes
diff --git a/net/irrd/distinfo b/net/irrd/distinfo
index 65fd5ef3fbc2..473574c6084e 100644
--- a/net/irrd/distinfo
+++ b/net/irrd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573895413
-SHA256 (irrd/v2.3.10.tar.gz) = acc1b6e5b219c617b1a614cfd586901183a184ee91a42c81473724161a63d65a
-SIZE (irrd/v2.3.10.tar.gz) = 769512
+TIMESTAMP = 1582065766
+SHA256 (irrdnet-irrd-legacy-v2.3.10_GH0.tar.gz) = acc1b6e5b219c617b1a614cfd586901183a184ee91a42c81473724161a63d65a
+SIZE (irrdnet-irrd-legacy-v2.3.10_GH0.tar.gz) = 769512
diff --git a/www/nginx-ultimate-bad-bot-blocker/Makefile b/www/nginx-ultimate-bad-bot-blocker/Makefile
index 39071779e79a..336baabbfbe9 100644
--- a/www/nginx-ultimate-bad-bot-blocker/Makefile
+++ b/www/nginx-ultimate-bad-bot-blocker/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=		nginx-ultimate-bad-bot-blocker
+DISTVERSIONPREFIX=	V
 DISTVERSION=		4.2020.02.1988
-DISTFILES=		V${PORTVERSION}${EXTRACT_SUFX}
 PORTREVISION=		0
 CATEGORIES=		www security
-MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Nginx bad bot and other things blocker
@@ -15,10 +14,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	gsed:textproc/gsed
 
-USE_GITHUB=	nodefault
+USE_GITHUB=	yes
 
 GH_ACCOUNT=	mitchellkrogza
-GH_PROJECT=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/www/nginx-ultimate-bad-bot-blocker/distinfo b/www/nginx-ultimate-bad-bot-blocker/distinfo
index a4af77bd7979..f424cf4bffc0 100644
--- a/www/nginx-ultimate-bad-bot-blocker/distinfo
+++ b/www/nginx-ultimate-bad-bot-blocker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582031978
-SHA256 (V4.2020.02.1988.tar.gz) = 9bf264f6192bf8a0d9f78f1c54bc2e3b9314ea1bf80bbb33b460514b0173b47b
-SIZE (V4.2020.02.1988.tar.gz) = 3785603
+TIMESTAMP = 1582064627
+SHA256 (mitchellkrogza-nginx-ultimate-bad-bot-blocker-V4.2020.02.1988_GH0.tar.gz) = 9bf264f6192bf8a0d9f78f1c54bc2e3b9314ea1bf80bbb33b460514b0173b47b
+SIZE (mitchellkrogza-nginx-ultimate-bad-bot-blocker-V4.2020.02.1988_GH0.tar.gz) = 3785603