diff -Nru golang-1.7-1.7.4/debian/changelog golang-1.7-1.7.4/debian/changelog
--- golang-1.7-1.7.4/debian/changelog	2017-04-05 00:21:02.000000000 +0000
+++ golang-1.7-1.7.4/debian/changelog	2017-04-26 20:36:28.000000000 +0000
@@ -1,3 +1,13 @@
+golang-1.7 (1.7.4-2+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from golang 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 golang 2:1.6.1-2+rpi1 by Peter Michael Green]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 26 Apr 2017 20:36:28 +0000
+
 golang-1.7 (1.7.4-2) unstable; urgency=medium
 
   * Backport CL 37964 for tzdata 2017a changes (Closes: #859583)
diff -Nru golang-1.7-1.7.4/debian/rules golang-1.7-1.7.4/debian/rules
--- golang-1.7-1.7.4/debian/rules	2017-04-04 23:52:45.000000000 +0000
+++ golang-1.7-1.7.4/debian/rules	2017-04-26 20:36:28.000000000 +0000
@@ -6,6 +6,7 @@
 
 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