diff --git a/src/go/build/build.go b/src/go/build/build.go
index fc03ddac98a..b1fb9ef94fb 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -1396,6 +1396,8 @@ func ArchChar(goarch string) (string, error) {
 		return "6", nil
 	case "arm":
 		return "5", nil
+	case "arm64":
+		return "7", nil
 	case "ppc64", "ppc64le":
 		return "9", nil
 	}
diff --git a/src/go/build/syslist.go b/src/go/build/syslist.go
index 9246cbf5572..e84a06666f1 100644
--- a/src/go/build/syslist.go
+++ b/src/go/build/syslist.go
@@ -5,4 +5,4 @@
 package build
 
 const goosList = "android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows "
-const goarchList = "386 amd64 amd64p32 arm ppc64 ppc64le "
+const goarchList = "386 amd64 amd64p32 arm arm64 ppc64 ppc64le "