diff -Nru golang-1.8-1.8.3/debian/changelog golang-1.8-1.8.3/debian/changelog
--- golang-1.8-1.8.3/debian/changelog	2017-07-24 20:51:01.000000000 +0000
+++ golang-1.8-1.8.3/debian/changelog	2018-01-11 19:00:33.000000000 +0000
@@ -1,3 +1,11 @@
+golang-1.8 (1.8.3-2+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 1.8.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 27 Jun 2017 23:56:40 +0000]
+  * Build with GOARM=6
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Jan 2018 19:00:33 +0000
+
 golang-1.8 (1.8.3-2) unstable; urgency=medium
 
   * Add 0001-Fix-FTBFS-with-Perl-526.patch
diff -Nru golang-1.8-1.8.3/debian/rules golang-1.8-1.8.3/debian/rules
--- golang-1.8-1.8.3/debian/rules	2017-07-24 20:51:01.000000000 +0000
+++ golang-1.8-1.8.3/debian/rules	2018-01-11 19:00:33.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)))