diff --git a/devel/shfmt/Makefile b/devel/shfmt/Makefile
index 94ffd9e1197e..a8ac49fb9265 100644
--- a/devel/shfmt/Makefile
+++ b/devel/shfmt/Makefile
@@ -1,38 +1,28 @@
 PORTNAME=	shfmt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.4
 CATEGORIES=	devel
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Shell script formatter
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
-USE_GITHUB=	yes
-GH_ACCOUNT=	mvdan
-GH_PROJECT=	sh
-GH_TUPLE=	golang:sys:201ba4db2418:golang_sys/vendor/golang.org/x/sys \
-		golang:term:ad39bd3f0407:golang_term/vendor/golang.org/x/term \
-		google:renameio:v0.1.0:google_renameio/vendor/github.com/google/renameio \
-		mvdan:editorconfig:e40951bde157:mvdan_editorconfig/vendor/mvdan.cc/editorconfig \
-		pkg:diff:5b29258ca4f7:pkg_diff/vendor/github.com/pkg/diff \
-		rogpeppe:go-internal:v1.6.2:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal
-
+GO_MODULE=	mvdan.cc/sh/v3
 GO_TARGET=	./cmd/shfmt
 GO_BUILDFLAGS=	-ldflags="-s -w -X main.version=${DISTVERSIONFULL}"
-GO_TESTTARGET=	./cmd/shfmt
 
 PLIST_FILES=	bin/shfmt
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_PLIST_FILES=	man/man1/shfmt.1.gz
 
 do-install-MANPAGES-on:
 	scdoc < ${WRKSRC}/cmd/shfmt/shfmt.1.scd \
 		> ${STAGEDIR}${MAN1PREFIX}/man/man1/shfmt.1
 
 .include <bsd.port.mk>
diff --git a/devel/shfmt/distinfo b/devel/shfmt/distinfo
index 202cc558110f..51762a320140 100644
--- a/devel/shfmt/distinfo
+++ b/devel/shfmt/distinfo
@@ -1,15 +1,5 @@
-TIMESTAMP = 1615214507
-SHA256 (mvdan-sh-v3.2.4_GH0.tar.gz) = cab10a689c09689175774c78d7c38e594539c18d4581610bb7927d299d0435d8
-SIZE (mvdan-sh-v3.2.4_GH0.tar.gz) = 181169
-SHA256 (golang-sys-201ba4db2418_GH0.tar.gz) = c5f2e55c3eabde3d255784e0799e7ca72720252884119a041c40c41a3e9d274a
-SIZE (golang-sys-201ba4db2418_GH0.tar.gz) = 1078756
-SHA256 (golang-term-ad39bd3f0407_GH0.tar.gz) = d257efbf736de99e1bdce2466d99432b5fd23706fadf30d9f394a39162aa4c2f
-SIZE (golang-term-ad39bd3f0407_GH0.tar.gz) = 3889
-SHA256 (google-renameio-v0.1.0_GH0.tar.gz) = 00bfe09fb180acc5ffbd0a7eb2c81f5bcf7e1bbbb146451297449e4b149a0077
-SIZE (google-renameio-v0.1.0_GH0.tar.gz) = 9723
-SHA256 (mvdan-editorconfig-e40951bde157_GH0.tar.gz) = 631efc11b4ac437766feb237deeba34e8a36aa6f161b82cf9e425b4ed664b4c2
-SIZE (mvdan-editorconfig-e40951bde157_GH0.tar.gz) = 9317
-SHA256 (pkg-diff-5b29258ca4f7_GH0.tar.gz) = 45f05eeea4cc13207ec66f3ef9134fcb070f9535bd717e1f250c337983bbcb36
-SIZE (pkg-diff-5b29258ca4f7_GH0.tar.gz) = 201083
-SHA256 (rogpeppe-go-internal-v1.6.2_GH0.tar.gz) = f1349be3b952255489205ec377d38eec04a76ed8abc6ec8a06f550782a23b216
-SIZE (rogpeppe-go-internal-v1.6.2_GH0.tar.gz) = 123261
+TIMESTAMP = 1621081695
+SHA256 (go/devel_shfmt/shfmt-v3.2.4/v3.2.4.mod) = 7154fb825e44324a502e8572c8c4e2eb24fd3dad147735961dc0cdfd855075b5
+SIZE (go/devel_shfmt/shfmt-v3.2.4/v3.2.4.mod) = 456
+SHA256 (go/devel_shfmt/shfmt-v3.2.4/v3.2.4.zip) = 23f64350c04108b636c75201cb080dac844f2b81703564eaeaf95bd7f643e532
+SIZE (go/devel_shfmt/shfmt-v3.2.4/v3.2.4.zip) = 200232