diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 87b94dee66..d6c6bba7a0 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,7 +1,7 @@
 # Template file for 'go'
 pkgname=go
 _bootstrap_version=1.4.2
-version=1.5.3
+version=1.6
 revision=1
 wrksrc=go
 hostmakedepends="git ca-certificates"
@@ -12,7 +12,7 @@ license="BSD"
 distfiles="http://golang.org/dl/go${_bootstrap_version}.src.tar.gz
  http://golang.org/dl/go${version}.src.tar.gz"
 checksum="299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b
- 754e06dab1c31ab168fc9db9e32596734015ea9e24bc44cae7f237f417ce4efe"
+ a96cce8ce43a9bf9b2a4c7d470bc7ee0cb00410da815980681c8353218dcf146"
 
 nostrip=yes
 noverifyrdeps=yes
@@ -52,12 +52,15 @@ do_build() {
 	export GOROOT_FINAL="/usr/lib/go"
 	export GOOS=
 	export GOARCH=
-	export GOPATH=/tmp
+	export GOPATH="${XBPS_BUILDDIR}/go_gopath"
 	export GOROOT_BOOTSTRAP="${XBPS_BUILDDIR}/go_bootstrap"
 	mkdir -p $GOPATH/src
 
 	cd "${XBPS_BUILDDIR}/go_bootstrap/src"
-	./make.bash
+	# Disable cgo when building the bootstrap compiler because Go
+	# 1.4.2 won't build otherwise with new binutils. See
+	# https://github.com/golang/go/issues/13896
+	CGO_ENABLED=0 ./make.bash
 
 	cd "${XBPS_BUILDDIR}/go/src"