diff -Nru rustc-1.17.0+dfsg2/debian/architecture.mk rustc-1.17.0+dfsg2/debian/architecture.mk
--- rustc-1.17.0+dfsg2/debian/architecture.mk	2017-04-05 14:31:40.000000000 +0000
+++ rustc-1.17.0+dfsg2/debian/architecture.mk	2017-07-28 13:32:44.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.17.0+dfsg2/debian/changelog rustc-1.17.0+dfsg2/debian/changelog
--- rustc-1.17.0+dfsg2/debian/changelog	2017-07-17 11:41:59.000000000 +0000
+++ rustc-1.17.0+dfsg2/debian/changelog	2017-07-28 13:32:44.000000000 +0000
@@ -1,3 +1,11 @@
+rustc (1.17.0+dfsg2-8+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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 28 Jul 2017 13:32:44 +0000
+
 rustc (1.17.0+dfsg2-8) unstable; urgency=medium
 
   * Workaround for linux #865549, fix FTBFS on ppc64el.
@@ -61,6 +69,16 @@
 
  -- Ximin Luo <infinity0@debian.org>  Tue, 16 May 2017 18:00:53 +0200
 
+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.