diff --git a/srcpkgs/gcc-go-tools b/srcpkgs/gcc-go-tools
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/srcpkgs/gcc-go-tools
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 8cbd6c282b9..9c3423b5255 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@ _gcjrel=17
 
 pkgname=gcc
 version=${_majorver}.1
-revision=2
+revision=3
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://gcc.gnu.org"
@@ -36,7 +36,7 @@ if [ -n "$CHROOT_READY" -a -z "$CROSS_BUILD" ]; then
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)	# Go won't link for musl libc
 			;;
-		*)	subpackages+=" gcc-go libgo-devel libgo"
+		*)	subpackages+=" gcc-go gcc-go-tools libgo-devel libgo"
 			;;
 	esac
 fi
@@ -331,13 +331,27 @@ gcc-go_package() {
 		for f in gccgo ${_triplet}-gccgo; do
 			vmove usr/bin/${f}
 		done
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/go1
+		for f in go1 cgo; do
+			vmove usr/lib/gcc/${_triplet}/${_majorver}/${f}
+		done
 		vmove usr/share/info/gccgo.info
 		touch ${PKGDESTDIR}/usr/share/info/dir
 		vmove usr/share/man/man1/gccgo.1
 		vmove usr/lib/go
 	}
 }
+gcc-go-tools_package() {
+	lib32disabled=yes
+	depends="gcc-go>=${_majorver}"
+	short_desc+=" - Go tools"
+	conflicts="go>=0"
+	pkg_install() {
+		vmove usr/bin/go
+		vmove usr/bin/gofmt
+		vmove usr/share/man/man1/go.1
+		vmove usr/share/man/man1/gofmt.1
+	}
+}
 gcc-fortran_package() {
 	lib32disabled=yes
 	depends="gcc>=${_majorver} libgfortran-devel>=${_majorver}"
@@ -424,7 +438,9 @@ libgo-devel_package() {
 	short_desc+=" - Go library - development files"
 	pkg_install() {
 		vmove usr/lib/libgo.a
+		vmove usr/lib/libnetgo.a
 		vmove usr/lib/libgobegin.a
+		vmove usr/lib/libgolibbegin.a
 		vmove usr/lib/libgo.so
 	}
 }