diff -Nru qt4-x11-4.8.6+git155-g716fbae+dfsg/debian/changelog qt4-x11-4.8.6+git155-g716fbae+dfsg/debian/changelog
--- qt4-x11-4.8.6+git155-g716fbae+dfsg/debian/changelog	2015-05-01 02:11:21.000000000 +0000
+++ qt4-x11-4.8.6+git155-g716fbae+dfsg/debian/changelog	2015-06-13 16:20:52.000000000 +0000
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-2+rpi1) stretch-staging; urgency=medium
+  [changes brought forward from 4:4.8.6+git64-g5dc8b2b+dfsg-2+rpi1 by Peter Micheal Green <plugwash@raspbian.org> at Thu, 31 Jul 2014 22:56:54 +0000]
+  * Disable neon
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 13 Jun 2015 16:19:19 +0000
+
 qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-2) unstable; urgency=medium
 
   * The previous upload fixed CVE-2015-1858, CVE-2015-1859, CVE-2015-1860.
diff -Nru qt4-x11-4.8.6+git155-g716fbae+dfsg/debian/rules qt4-x11-4.8.6+git155-g716fbae+dfsg/debian/rules
--- qt4-x11-4.8.6+git155-g716fbae+dfsg/debian/rules	2014-09-06 22:53:05.000000000 +0000
+++ qt4-x11-4.8.6+git155-g716fbae+dfsg/debian/rules	2015-06-13 16:20:52.000000000 +0000
@@ -51,7 +51,7 @@
 
 armv6_architectures := armhf
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures)))
-	extra_configure_opts += -arch armv6
+	extra_configure_opts += -arch armv6 -no-neon
 endif
 
 ifeq ($(vendor),Ubuntu)