diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index dbcca4594d..8a6feeb2f4 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -44,9 +44,11 @@ do_extract() {
 	tar -xf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/go${version}.src.tar.gz" \
 		-C "${XBPS_BUILDDIR}/go" --strip-components=1
 
-	# Fix a gcc6 warning regarding signed shift left
+	# Fix gcc6 warnings regarding signed shift left
 	sed -i ${XBPS_BUILDDIR}/go_bootstrap/src/cmd/6c/txt.c \
 		-e's;f->vconst |= (vlong)~0 << 32;f->vconst = (vlong)(~0ull << 32);'
+	sed -i ${XBPS_BUILDDIR}/go_bootstrap/src/cmd/8g/ggen.c \
+		-e's;-1LL<<(t->width\*8-1);~0ULL<<(t->width*8-1);'
 }
 
 do_build() {