diff --git a/lang/go-devel/Makefile b/lang/go-devel/Makefile
index 7145af685bc7..cb5333e83664 100644
--- a/lang/go-devel/Makefile
+++ b/lang/go-devel/Makefile
@@ -1,27 +1,30 @@
 # Created by: Devon H. O'Dell <devon.odell@gmail.com>
 
-PORTVERSION=	g20210816
-# Always set PORTREVISION and PORTEPOCH explicitly as otherwise it is inherited from lang/go
+PORTVERSION=	g20210902
+# Always set PORTREVISION and PORTEPOCH explicitly as otherwise they are inherited from lang/go
 PORTREVISION=	0
 PORTEPOCH=	0
 MASTER_SITES=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
 PKGNAMESUFFIX=	-devel
 DISTFILES=	go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
 
+# Avoid conflicting patch files
+PATCHFILES=
+
 COMMENT=	Go programming language (development version)
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
-GH_TAGNAME=	ec5170397c724a8ae440b2bc529f857c86f0e6b1
+GH_TAGNAME=	782aa42255163559c5e1c4c2d98c8f28da8cf96b
 
 CONFLICTS_INSTALL=	go
 
 MASTERDIR=	${.CURDIR}/../go
 PATCHDIR=	${.CURDIR}/files
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 post-extract:
 	@[ -f ${WRKSRC}/VERSION ] || ${ECHO_CMD} "devel +${GH_TAGNAME}" > ${WRKSRC}/VERSION
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/go-devel/distinfo b/lang/go-devel/distinfo
index c32732ec50ba..a69c1c4668f2 100644
--- a/lang/go-devel/distinfo
+++ b/lang/go-devel/distinfo
@@ -1,13 +1,15 @@
-TIMESTAMP = 1629295181
+TIMESTAMP = 1630672138
 SHA256 (go-freebsd-arm64-go1.14.tar.xz) = f8b0cf0d323e581c9e3e0d5c217847a3e0294fcc92dbac92a5b02cea9d97ad8d
 SIZE (go-freebsd-arm64-go1.14.tar.xz) = 34944548
-SHA256 (golang-go-g20210816-ec5170397c724a8ae440b2bc529f857c86f0e6b1_GH0.tar.gz) = 7265002da9f1142432f7f0fc554b1df1a548fd30262c267477d2e73a1d365004
-SIZE (golang-go-g20210816-ec5170397c724a8ae440b2bc529f857c86f0e6b1_GH0.tar.gz) = 22147624
+SHA256 (golang-go-g20210902-782aa42255163559c5e1c4c2d98c8f28da8cf96b_GH0.tar.gz) = f8ac0944636dc2be0ec0d782817761ce13d0e901a530073f0aa4293da7a0402a
+SIZE (golang-go-g20210902-782aa42255163559c5e1c4c2d98c8f28da8cf96b_GH0.tar.gz) = 22319396
+SHA256 (782aa42255163559c5e1c4c2d98c8f28da8cf96b.patch) = af6c73b4c403a7aa7aa7865d25799141d28d29447a613f3c8c6c77f9fa41d7f6
+SIZE (782aa42255163559c5e1c4c2d98c8f28da8cf96b.patch) = 1111
 SHA256 (go-freebsd-amd64-go1.14.tar.xz) = 3b259247fb228258a4f31e283e9aa23cafd590eabce334666a9e9b2ffe47c19b
 SIZE (go-freebsd-amd64-go1.14.tar.xz) = 35927980
 SHA256 (go-freebsd-arm6-go1.14.tar.xz) = 5846b4bbc6881c6c04daffbdb647d53a5b002a0e177271ecfcabef734b209614
 SIZE (go-freebsd-arm6-go1.14.tar.xz) = 35164388
 SHA256 (go-freebsd-arm7-go1.14.tar.xz) = 3d40c0f093bc3dc6cb84e92f8462a9c6a88a19a0ba75f813211f9d5d766b7737
 SIZE (go-freebsd-arm7-go1.14.tar.xz) = 35398032
 SHA256 (go-freebsd-386-go1.14.tar.xz) = c1a798154ae1ed2be6027d883e4611dd19edbe07a3f6d4f71d9437bddf3ed9ca
 SIZE (go-freebsd-386-go1.14.tar.xz) = 36118928