diff -Nru golang-1.10-1.10.1/debian/changelog golang-1.10-1.10.1/debian/changelog
--- golang-1.10-1.10.1/debian/changelog	2018-04-22 21:21:05.000000000 +0000
+++ golang-1.10-1.10.1/debian/changelog	2018-04-26 06:49:59.000000000 +0000
@@ -1,3 +1,12 @@
+golang-1.10 (1.10.1-3+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 1.10~rc2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 24 Feb 2018 12:22:04 +0000]
+  * Build with GOARM=6
+  * Disable testsuite.
+  * Fix clean target.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Apr 2018 06:49:59 +0000
+
 golang-1.10 (1.10.1-3) unstable; urgency=high
 
   * Team upload.
diff -Nru golang-1.10-1.10.1/debian/rules golang-1.10-1.10.1/debian/rules
--- golang-1.10-1.10.1/debian/rules	2018-04-22 21:21:05.000000000 +0000
+++ golang-1.10-1.10.1/debian/rules	2018-04-26 06:49:58.000000000 +0000
@@ -7,12 +7,13 @@
 export GOROOT := $(CURDIR)
 export GOROOT_FINAL := /usr/lib/go-$(GOVER)
 export GOCACHE := off
+export GOARM := 6
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
 RUN_TESTS := true
 # armel: ???
 # ppc64: ???
-ifneq (,$(filter armel ppc64,$(DEB_HOST_ARCH)))
+ifneq (,$(filter armhf armel ppc64,$(DEB_HOST_ARCH)))
 	RUN_TESTS := false
 endif
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -45,6 +46,13 @@
 	@set -e; cd debian; for x in golang-X.Y-*; do \
 		rm -f -v golang-$(GOVER)-$${x##golang-X.Y-}; \
 	done
+	# more cleanup
+	rm -f `find . -name *.o`
+	rm -f `find . -name *.exe`
+	rm -f src/cmd/go/internal/cfg/zdefaultcc.go
+	rm -f src/cmd/go/internal/cfg/zosarch.go
+	rm -f src/cmd/internal/objabi/zbootstrap.go
+	rm -f src/go/build/zcgo.go
 
 override_dh_prep:
 	dh_prep