diff -Nru rustc-1.16.0+dfsg1/debian/architecture.mk rustc-1.16.0+dfsg1/debian/architecture.mk
--- rustc-1.16.0+dfsg1/debian/architecture.mk	2017-04-05 14:31:40.000000000 +0000
+++ rustc-1.16.0+dfsg1/debian/architecture.mk	2017-07-08 15:15:03.000000000 +0000
@@ -2,7 +2,7 @@
 
 include /usr/share/dpkg/architecture.mk
 
-rust_cpu = $(subst i586,i686,$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),$(1)))
+rust_cpu = $(subst i586,i686,$(1))
 rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM)
 
 $(foreach machine,BUILD HOST TARGET,\
diff -Nru rustc-1.16.0+dfsg1/debian/changelog rustc-1.16.0+dfsg1/debian/changelog
--- rustc-1.16.0+dfsg1/debian/changelog	2017-04-19 20:47:18.000000000 +0000
+++ rustc-1.16.0+dfsg1/debian/changelog	2017-07-08 23:35:25.000000000 +0000
@@ -1,3 +1,13 @@
+rustc (1.16.0+dfsg1-1+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
+  * Fix clean target.
+  * Build for armv6.
+  * Manually fixup "install" step so that only armv6 stuff ends up
+    in the resulting packages.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 08 Jul 2017 23:35:25 +0000
+
 rustc (1.16.0+dfsg1-1) unstable; urgency=medium
 
   * Upload to unstable so we have something to build 1.17 with.
diff -Nru rustc-1.16.0+dfsg1/debian/rules rustc-1.16.0+dfsg1/debian/rules
--- rustc-1.16.0+dfsg1/debian/rules	2017-04-19 20:41:07.000000000 +0000
+++ rustc-1.16.0+dfsg1/debian/rules	2017-07-08 23:34:36.000000000 +0000
@@ -133,6 +133,8 @@
 	fi
 	$(RM) src/rt/hoedown/src/html_blocks.c # clean up after building this ourselves
 	$(RM) src/bootstrap/bootstrap.pyc
+	rm -rf src/etc/__pycache__ *-linux-gnu* config.tmp
+	rm -f dl/rustc-1.14.0-arm-unknown-linux-gnueabihf.tar.gz
 
 # upstream bundles this in the source, but in Debian we rebuild everything yo
 generate-sources:
@@ -150,8 +152,17 @@
 endif
 
 override_dh_auto_install:
+	#rm -rf armv7-unknown-linux-gnueabihf
 	dh_auto_install --destdir=$(DEB_DESTDIR)
 
+	#upstream build produces both armv6 and armv7 stuff and installs a 
+        #mixture of both. Fix things up so that only the armv6 stuff ends up
+	#in the packages.
+	cp arm-unknown-linux-gnueabihf/stage2/bin/rustc debian/tmp/usr/bin/
+	cp arm-unknown-linux-gnueabihf/stage2/bin/rustdoc debian/tmp/usr/bin/
+	cp arm-unknown-linux-gnueabihf/stage2/lib/*.so debian/tmp/usr/lib/
+	rm -rf debian/tmp/usr/lib/rustlib/*armv7-unknown-linux-gnueabihf
+
 	mkdir -p $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/
 	mv $(DEB_DESTDIR)/usr/lib/lib*.so $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/