diff --git a/mail/smtprelay/Makefile b/mail/smtprelay/Makefile
index f9faea484740..e2fa299dc9c4 100644
--- a/mail/smtprelay/Makefile
+++ b/mail/smtprelay/Makefile
@@ -1,32 +1,24 @@
 PORTNAME=	smtprelay
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.6.0
+DISTVERSION=	1.7.0
 CATEGORIES=	mail
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Simple Go SMTP relay/proxy server
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
-USE_RC_SUBR=	smtprelay
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	decke
+GO_MODULE=	github.com/decke/smtprelay
 
-GH_TUPLE=	chrj:smtpd:v0.3.0:chrj_smtpd/vendor/github.com/chrj/smtpd \
-		golang:crypto:eec23a3978ad:golang_crypto/vendor/golang.org/x/crypto \
-		golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \
-		google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
-		sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		vharitonsky:iniflags:a33cd0b5f3de:vharitonsky_iniflags/vendor/github.com/vharitonsky/iniflags
+USE_RC_SUBR=	smtprelay
 
 PLIST_FILES=	bin/${PORTNAME} \
 		"@sample ${ETCDIR}/smtprelay.ini.sample"
 
 post-install:
 		${MKDIR} ${STAGEDIR}${ETCDIR}
 		${INSTALL_DATA} ${WRKSRC}/smtprelay.ini ${STAGEDIR}${ETCDIR}/smtprelay.ini.sample
 
 .include <bsd.port.mk>
diff --git a/mail/smtprelay/distinfo b/mail/smtprelay/distinfo
index d219c0adf431..84334644b3af 100644
--- a/mail/smtprelay/distinfo
+++ b/mail/smtprelay/distinfo
@@ -1,15 +1,5 @@
-TIMESTAMP = 1617476197
-SHA256 (decke-smtprelay-v1.6.0_GH0.tar.gz) = fc3eeafff5d9be0a570bb4c1f2e3fdbc9d7485e66af0611341c4a7fe063b3ff5
-SIZE (decke-smtprelay-v1.6.0_GH0.tar.gz) = 16443
-SHA256 (chrj-smtpd-v0.3.0_GH0.tar.gz) = ef082bb858a04cd5dd10c40f044c47a943284315ad70e90914aa8c7e58280ded
-SIZE (chrj-smtpd-v0.3.0_GH0.tar.gz) = 19059
-SHA256 (golang-crypto-eec23a3978ad_GH0.tar.gz) = bd882536660d6b65619c9d9b9334e9a5c55557613e56e1b485323a2293dfa2f8
-SIZE (golang-crypto-eec23a3978ad_GH0.tar.gz) = 1725798
-SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
-SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
-SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
-SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
-SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74
-SIZE (sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161
-SHA256 (vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = d60f3292be138071158e47e794c2ba93ea9dfc866c44e6472833e2d8566024aa
-SIZE (vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = 7498
+TIMESTAMP = 1637596104
+SHA256 (go/mail_smtprelay/smtprelay-v1.7.0/v1.7.0.mod) = 32e331591c9a21c0167a08dcc3a9c3ebe951fcb339faf55cc9783e2fbaf20faa
+SIZE (go/mail_smtprelay/smtprelay-v1.7.0/v1.7.0.mod) = 276
+SHA256 (go/mail_smtprelay/smtprelay-v1.7.0/v1.7.0.zip) = 0bdf42e9a85d2da67e37ba53296e817727500afff01add47b66ea6efd6dbbc7e
+SIZE (go/mail_smtprelay/smtprelay-v1.7.0/v1.7.0.zip) = 21632