diff -Nru golang-1.11-1.11.5/debian/changelog golang-1.11-1.11.5/debian/changelog
--- golang-1.11-1.11.5/debian/changelog	2019-01-24 07:23:06.000000000 +0000
+++ golang-1.11-1.11.5/debian/changelog	2019-01-31 23:43:38.000000000 +0000
@@ -1,3 +1,12 @@
+golang-1.11 (1.11.5-1+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from golang-1.10 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, 31 Jan 2019 23:43:38 +0000
+
 golang-1.11 (1.11.5-1) unstable; urgency=high
 
   * New upstream version 1.11.5, fixing CVE-2019-6486
diff -Nru golang-1.11-1.11.5/debian/rules golang-1.11-1.11.5/debian/rules
--- golang-1.11-1.11.5/debian/rules	2019-01-24 07:23:06.000000000 +0000
+++ golang-1.11-1.11.5/debian/rules	2019-01-31 23:43:38.000000000 +0000
@@ -6,6 +6,7 @@
 
 export GOROOT := $(CURDIR)
 export GOROOT_FINAL := /usr/lib/go-$(GOVER)
+export GOARM := 6
 
 # We need DEB_HOST_ARCH, so include the needed makefile snippet
 include /usr/share/dpkg/architecture.mk
@@ -13,7 +14,7 @@
 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)))
@@ -46,6 +47,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