diff -Nru qtbase-opensource-src-5.7.1~20161021+dfsg/debian/changelog qtbase-opensource-src-5.7.1~20161021+dfsg/debian/changelog
--- qtbase-opensource-src-5.7.1~20161021+dfsg/debian/changelog	2016-11-20 14:28:32.000000000 +0000
+++ qtbase-opensource-src-5.7.1~20161021+dfsg/debian/changelog	2016-11-28 23:24:08.000000000 +0000
@@ -1,3 +1,13 @@
+qtbase-opensource-src (5.7.1~20161021+dfsg-6+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 5.3.2+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Nov 2014 01:56:58 +0000]
+  * Disable neon (-no-neon no longer seems to work, so edit configure instead)
+
+  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
+  * Partially fix clean target.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 28 Nov 2016 23:24:08 +0000
+
 qtbase-opensource-src (5.7.1~20161021+dfsg-6) unstable; urgency=medium
 
   [ Dmitry Shachnev ]
diff -Nru qtbase-opensource-src-5.7.1~20161021+dfsg/debian/patches/disable-neon.patch qtbase-opensource-src-5.7.1~20161021+dfsg/debian/patches/disable-neon.patch
--- qtbase-opensource-src-5.7.1~20161021+dfsg/debian/patches/disable-neon.patch	1970-01-01 00:00:00.000000000 +0000
+++ qtbase-opensource-src-5.7.1~20161021+dfsg/debian/patches/disable-neon.patch	2016-11-28 23:24:08.000000000 +0000
@@ -0,0 +1,30 @@
+Description: Disable neon 
+ -no-neon no longer seems to work, so edit configure instead
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: qtbase-opensource-src-5.4.2+dfsg/configure
+===================================================================
+--- qtbase-opensource-src-5.4.2+dfsg.orig/configure
++++ qtbase-opensource-src-5.4.2+dfsg/configure
+@@ -677,7 +677,7 @@ CFG_AVX2=auto
+ CFG_REDUCE_RELOCATIONS=auto
+ CFG_ACCESSIBILITY=auto
+ CFG_ACCESSIBILITY_ATSPI_BRIDGE=no # will be enabled depending on dbus and accessibility being enabled
+-CFG_NEON=auto
++CFG_NEON=no
+ CFG_MIPS_DSP=auto
+ CFG_MIPS_DSPR2=auto
+ CFG_CLOCK_GETTIME=auto
diff -Nru qtbase-opensource-src-5.7.1~20161021+dfsg/debian/patches/series qtbase-opensource-src-5.7.1~20161021+dfsg/debian/patches/series
--- qtbase-opensource-src-5.7.1~20161021+dfsg/debian/patches/series	2016-11-19 13:44:43.000000000 +0000
+++ qtbase-opensource-src-5.7.1~20161021+dfsg/debian/patches/series	2016-11-28 23:24:08.000000000 +0000
@@ -11,3 +11,4 @@
 link_fbclient.diff
 gnukfreebsd_cloexec.diff
 armv4.diff
+disable-neon.patch
diff -Nru qtbase-opensource-src-5.7.1~20161021+dfsg/debian/rules qtbase-opensource-src-5.7.1~20161021+dfsg/debian/rules
--- qtbase-opensource-src-5.7.1~20161021+dfsg/debian/rules	2016-11-02 11:17:56.000000000 +0000
+++ qtbase-opensource-src-5.7.1~20161021+dfsg/debian/rules	2016-11-28 23:24:08.000000000 +0000
@@ -214,6 +214,9 @@
 	# more leftovers
 	rm -f .device.vars .qmake.vars
 
+	# yet more crap
+	rm -rf doc/q*
+
 ifeq ($(vendor),Ubuntu)
 	rm -rf po
 endif