diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d24481f8ffe..cc65bfd5788 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -2,7 +2,7 @@
 pkgname=go
 _bootstrap_version=1.4.2
 version=1.7.1
-revision=1
+revision=2
 wrksrc=go
 hostmakedepends="git ca-certificates"
 short_desc="The Go Programming Language"
@@ -27,6 +27,7 @@ _go_targetarch() {
 		x86_64*) export hostarch=amd64;;
 	esac
 	case "$XBPS_TARGET_MACHINE" in
+		aarch64*) targetarch=arm64;;
 		arm*) targetarch=arm;;
 		i686*) targetarch=386;;
 		x86_64*) targetarch=amd64;;
@@ -67,6 +68,9 @@ do_build() {
 	GOOS=linux
 	GOARCH=arm
 	bash make.bash --no-clean
+	GOOS=linux
+	GOARCH=arm64
+	bash make.bash --no-clean
 	for os in darwin freebsd linux windows; do
 		for arch in 386 amd64; do
 			GOARCH=$arch
@@ -92,6 +96,7 @@ do_install() {
 
 	if [ "$CROSS_BUILD" ]; then
 		case "$XBPS_TARGET_MACHINE" in
+			aarch64*) bindir=bin/linux_arm64;;
 			arm*) bindir=bin/linux_arm;;
 			i686*) bindir=bin/linux_386;;
 			x86_64*) bindir=bin/linux_amd64;;