diff -Nru golang-1.6/debian/changelog golang-1.6/debian/changelog
--- golang-1.6/debian/changelog	2016-03-01 00:10:41.000000000 +0000
+++ golang-1.6/debian/changelog	2016-03-17 21:21:24.000000000 +0000
@@ -1,3 +1,10 @@
+golang (2:1.6-1+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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 17 Mar 2016 21:21:23 +0000
+
 golang (2:1.6-1) unstable; urgency=medium
 
   * Update to 1.6 upstream release (thanks Hilko!)
diff -Nru golang-1.6/debian/rules golang-1.6/debian/rules
--- golang-1.6/debian/rules	2016-03-01 00:10:30.000000000 +0000
+++ golang-1.6/debian/rules	2016-03-17 21:21:24.000000000 +0000
@@ -4,6 +4,7 @@
 
 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