diff -Nru golang-1.9-1.9.2/debian/changelog golang-1.9-1.9.2/debian/changelog
--- golang-1.9-1.9.2/debian/changelog	2017-12-08 01:09:24.000000000 +0000
+++ golang-1.9-1.9.2/debian/changelog	2018-01-11 19:38:53.000000000 +0000
@@ -1,3 +1,11 @@
+golang-1.9 (1.9.2-4+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 1.9.2-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 08 Nov 2017 00:15:02 +0000]
+  * Build with goarm=6
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Jan 2018 19:38:53 +0000
+
 golang-1.9 (1.9.2-4) unstable; urgency=medium
 
   * Enable building on mips, mipsel and mips64. (Closes: 879764)
diff -Nru golang-1.9-1.9.2/debian/rules golang-1.9-1.9.2/debian/rules
--- golang-1.9-1.9.2/debian/rules	2017-12-08 01:05:06.000000000 +0000
+++ golang-1.9-1.9.2/debian/rules	2018-01-11 19:38:52.000000000 +0000
@@ -6,9 +6,10 @@
 
 export GOROOT := $(CURDIR)
 export GOROOT_FINAL := /usr/lib/go-$(GOVER)
+export GOARM := 6
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
-RUN_TESTS := true
+RUN_TESTS := false
 # armel: ???
 # ppc64: ???
 ifneq (,$(filter armel ppc64,$(DEB_HOST_ARCH)))
@@ -38,7 +39,12 @@
 		src/cmd/cgo/zdefaultcc.go \
 		src/cmd/go/zdefaultcc.go \
 		src/cmd/internal/obj/zbootstrap.go \
-		src/runtime/internal/sys/zversion.go
+		src/runtime/internal/sys/zversion.go \
+		src/go/build/zcgo.go \
+		test/runtest.exe \
+		src/cmd/go/internal/cfg/zdefaultcc.go \
+		src/cmd/go/internal/cfg/zosarch.go \
+		src/cmd/internal/objabi/zbootstrap.go 
 	# remove built objects
 	rm -rf bin pkg
 	@set -e; cd debian; for x in golang-X.Y-*; do \