diff --git a/lang/go/Makefile b/lang/go/Makefile
index a0f473ef9112..7330ec5f1b3f 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -1,127 +1,131 @@
 # Created by: Devon H. O'Dell <devon.odell@gmail.com>
 
 PORTNAME=	go
 PORTVERSION?=	1.17
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES=	lang
 MASTER_SITES?=	https://golang.org/dl/ \
 		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
 DISTFILES?=	go${PORTVERSION}.src.tar.gz \
 		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
 
+# backport https://go-review.googlesource.com/c/go/+/346872/ to go1.17
+PATCH_SITES?=	https://github.com/golang/go/commit/
+PATCHFILES?=	782aa42255163559c5e1c4c2d98c8f28da8cf96b.patch:-p1
+
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT?=	Go programming language
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .ifdef QEMU_EMULATING
 IGNORE=		fails to build with qemu-user-static
 .endif
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 
 RUN_DEPENDS=	${RUN_DEPENDS_${ARCH}}
 # ld.bfd from devel/binutils is needed for working cgo on aarch64
 RUN_DEPENDS_aarch64=	binutils>0:devel/binutils
 
 TEST_DEPENDS=	${TEST_DEPENDS_${ARCH}}
 TEST_DEPENDS_aarch64=	binutils>0:devel/binutils
 
 USES=		shebangfix
 
 SHEBANG_FILES=	misc/wasm/go_js_wasm_exec \
 		src/net/http/cgi/testdata/test.cgi
 SHEBANG_GLOB=	*.bash *.pl *.sh
 
 CONFLICTS_INSTALL?=	go-devel
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
 
 .ifndef MASTERDIR
 WRKSRC=		${WRKDIR}/go
 .endif
 
 OPTIONS_DEFINE_i386=	SOFTFLOAT
 
 SOFTFLOAT_DESC=	Use soft float on non-SSE2 processors (Pentium 4 and older)
 
 SOFTFLOAT_VARS=	GO386=softfloat
 
 BINARIES=	go gofmt
 BOOTSTRAP_TAG=	go1.14
 
 GOARCH_aarch64=	arm64
 GOARCH_amd64=	amd64
 GOARCH_armv6=	arm
 GOARCH_armv7=	arm
 GOARCH_i386=	386
 
 GOARM_armv6=	6
 GOARM_armv7=	7
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 && ${OSVERSION} < 1200000
 IGNORE=		aarch64 support requires FreeBSD 12.0 or newer
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^if ulimit -T|false \&\& &|' ${WRKSRC}/src/run.bash
 
 pre-build:
 	# Check that the running kernel has COMPAT_FREEBSD11 required by lang/go{,-devel} post-ino64
 	@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
 		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
 
 do-build:
 	cd ${WRKSRC}/src ; ${SETENV} \
 		XDG_CACHE_HOME=${WRKDIR} \
 		GOROOT_BOOTSTRAP=${WRKDIR}/go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-bootstrap \
 		GOROOT=${WRKSRC} \
 		GOROOT_FINAL=${PREFIX}/go \
 		GOBIN= \
 		GOOS=${OPSYS:tl} \
 		GOARCH=${GOARCH_${ARCH}} \
 		GO386=${GO386} \
 		GOARM=${GOARM_${ARCH}} \
 		${SH} make.bash -v
 
 do-install:
 	@cd ${WRKSRC} ; \
 		${RM} -r .gitattributes .gitignore .github favicon.ico robots.txt \
 		pkg/obj pkg/bootstrap pkg/${OPSYS:tl}_${GOARCH_${ARCH}}/cmd
 	@${MKDIR} ${STAGEDIR}${PREFIX}/go
 	@${CP} -a ${WRKSRC}/* ${STAGEDIR}${PREFIX}/go
 .for file in ${BINARIES}
 	@${LN} -sf ../go/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file}
 	@${ECHO_CMD} bin/${file} >> ${TMPPLIST}
 .endfor
 	@cd ${STAGEDIR}${PREFIX} && ${FIND} go -type f >> ${TMPPLIST}
 
 do-test:
 	cd ${WRKSRC}/src && ${SETENV} \
 		GOROOT=${WRKSRC} \
 		PATH=${WRKSRC}/bin:${PATH} \
 		GOOS=${OPSYS:tl} \
 		GOARCH=${GOARCH_${ARCH}} \
 		GO386=${GO386} \
 		GOARM=${GOARM_${ARCH}} \
 		${SH} run.bash -no-rebuild
 
 .if !defined(_GO_MAKESUM_GUARD)
 makesum:
 	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp
 .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]}
 	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch}
 	${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp
 	${RM} ${DISTINFO_FILE}.${arch}
 .endfor
 	${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE}
 	${RM} ${DISTINFO_FILE}.tmp
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 7cbe2d6f5974..9ace7a72ac0f 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,13 +1,15 @@
-TIMESTAMP = 1629293668
+TIMESTAMP = 1630671276
 SHA256 (go1.17.src.tar.gz) = 3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d
 SIZE (go1.17.src.tar.gz) = 22178549
 SHA256 (go-freebsd-arm64-go1.14.tar.xz) = f8b0cf0d323e581c9e3e0d5c217847a3e0294fcc92dbac92a5b02cea9d97ad8d
 SIZE (go-freebsd-arm64-go1.14.tar.xz) = 34944548
+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