diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile
index a988b62f442c..65a8dce01cfe 100644
--- a/net/geoipupdate/Makefile
+++ b/net/geoipupdate/Makefile
@@ -1,66 +1,61 @@
 # Created by: adamw
 
 PORTNAME=	geoipupdate
 PORTVERSION=	4.7.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net geography
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Fetch the latest copies of the GeoIP2 databases
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 RUN_DEPENDS=	ca_root_nss>=3:security/ca_root_nss
 
 USES=		gmake go:modules,no_targets
-USE_GITHUB=	yes
-GH_ACCOUNT=	maxmind
+GO_MODULE=	github.com/maxmind/geoipupdate/v4
 
 MAKE_ENV+=	${GO_ENV} \
 		CONFFILE=${PREFIX}/etc/GeoIP.conf \
 		DATADIR=${PREFIX}/share/GeoIP \
 		VERSION=${DISTVERSIONFULL}
 
-GH_TUPLE=	gofrs:flock:v0.8.0:gofrs_flock/vendor/github.com/gofrs/flock \
-		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
-		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag
-
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	lowdown:textproc/lowdown
 MANPAGES_PLIST_FILES=	man/man1/geoipupdate.1.gz \
 			man/man5/GeoIP.conf.5.gz
 
 PLIST_FILES=	bin/geoipupdate \
 		'@sample etc/GeoIP.conf.sample' \
 		'@dir share/GeoIP'
 PORTDOCS=	GeoIP.conf.md geoipupdate.md
 SUB_FILES=	pkg-message
 
 do-build-MANPAGES-on:
 	# lowdown generates everything as section 7
 	{ ${PRINTF} "title: geoipupdate\n\n" && ${CAT} ${WRKSRC}/doc/geoipupdate.md; } \
 		| ${LOCALBASE}/bin/lowdown -s -Tman \
 		| ${SED} -e '1s/7/1/' > ${WRKSRC}/build/geoipupdate.1
 	{ ${PRINTF} "title: GeoIP.conf\n\n" && ${CAT} ${WRKSRC}/doc/GeoIP.conf.md; } \
 		| ${LOCALBASE}/bin/lowdown -s -Tman \
 		| ${SED} -e '1s/7/5/' > ${WRKSRC}/build/GeoIP.conf.5
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/GeoIP
 	${INSTALL_PROGRAM} ${WRKSRC}/build/geoipupdate ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/build/GeoIP.conf ${STAGEDIR}${PREFIX}/etc/GeoIP.conf.sample
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/build && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 do-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/build/geoipupdate.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/build/GeoIP.conf.5  ${STAGEDIR}${MANPREFIX}/man/man5
 
 .include <bsd.port.mk>
diff --git a/net/geoipupdate/distinfo b/net/geoipupdate/distinfo
index 228ad1488108..b3b1367da4b1 100644
--- a/net/geoipupdate/distinfo
+++ b/net/geoipupdate/distinfo
@@ -1,9 +1,5 @@
-TIMESTAMP = 1618859168
-SHA256 (maxmind-geoipupdate-v4.7.1_GH0.tar.gz) = e3176325f916571244562a2fec58e0c9ce624f84dbf946616921be8521cbfd94
-SIZE (maxmind-geoipupdate-v4.7.1_GH0.tar.gz) = 33334
-SHA256 (gofrs-flock-v0.8.0_GH0.tar.gz) = 64aa198aee88a6b560e2eb9a87794594e0b57c08a784dcb4bd8a0825b9ec5de6
-SIZE (gofrs-flock-v0.8.0_GH0.tar.gz) = 8978
-SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
-SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
-SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
-SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
+TIMESTAMP = 1621081309
+SHA256 (go/net_geoipupdate/geoipupdate-v4.7.1/v4.7.1.mod) = 60128b95470fdfd902a420d415d729dfe863c7f0b82722feb38830395edbd63e
+SIZE (go/net_geoipupdate/geoipupdate-v4.7.1/v4.7.1.mod) = 548
+SHA256 (go/net_geoipupdate/geoipupdate-v4.7.1/v4.7.1.zip) = aeb07bafdccdaf5efd192c48426a5d764681f59884ed5e312da3016588bef31e
+SIZE (go/net_geoipupdate/geoipupdate-v4.7.1/v4.7.1.zip) = 50986