diff -Nru golang-1.6.1/debian/changelog golang-1.6.1/debian/changelog
--- golang-1.6.1/debian/changelog	2016-04-13 22:48:04.000000000 +0000
+++ golang-1.6.1/debian/changelog	2016-05-19 10:32:53.000000000 +0000
@@ -1,3 +1,13 @@
+golang (2:1.6.1-2+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 2:1.5.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 21 Jan 2016 20:49:39 +0000]
+  * Force build for armv6.
+  
+  [changes introduced in 2:1.6.1-2+rpi1 by Peter Michael Green]
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 23 Apr 2016 16:02:50 +0000
+
 golang (2:1.6.1-2) unstable; urgency=medium
 
   * Don't strip testdata files, causes build failures on some platforms. 
diff -Nru golang-1.6.1/debian/rules golang-1.6.1/debian/rules
--- golang-1.6.1/debian/rules	2016-04-13 22:47:33.000000000 +0000
+++ golang-1.6.1/debian/rules	2016-05-19 10:33:33.000000000 +0000
@@ -4,9 +4,10 @@
 
 export GOROOT := $(CURDIR)
 export GOROOT_FINAL := /usr/lib/go
+export GOARM := 6
 
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
-RUN_TESTS := true
+RUN_TESTS := false
 ifeq (ppc64, $(DEB_HOST_ARCH_CPU))
 	RUN_TESTS := false
 endif