diff -Nru qt4-x11-4.7.4/debian/changelog qt4-x11-4.7.4/debian/changelog
--- qt4-x11-4.7.4/debian/changelog	2012-03-24 22:32:37.000000000 +0000
+++ qt4-x11-4.7.4/debian/changelog	2012-05-10 19:43:53.000000000 +0100
@@ -1,3 +1,15 @@
+qt4-x11 (4:4.7.4-3+rpi2) wheezy; urgency=low
+
+  * Disable neon
+
+ -- Peter Michael Green <plugwash@p10link.net>  Thu, 10 May 2012 18:43:15 +0000
+
+qt4-x11 (4:4.7.4-3+rpi1) unstable; urgency=low
+
+  * disable patch that makes the "armv6" code actually armv7
+
+ -- Peter Micheal Green <plugwash@p10link.net>  Tue, 08 May 2012 19:54:55 +0000
+
 qt4-x11 (4:4.7.4-3) unstable; urgency=low
 
   * Team upload.
diff -Nru qt4-x11-4.7.4/debian/patches/series qt4-x11-4.7.4/debian/patches/series
--- qt4-x11-4.7.4/debian/patches/series	2012-03-24 22:03:29.000000000 +0000
+++ qt4-x11-4.7.4/debian/patches/series	2012-05-08 20:49:06.000000000 +0100
@@ -48,7 +48,7 @@
 kfreebsd_monotonic_clock.diff
 powerpc_designer_gstabs.diff
 armv6_Include_explicitly_IT_instructions.patch
-armv6_Add_support_for_ARMv7_atomic_operations.patch
+#armv6_Add_support_for_ARMv7_atomic_operations.patch
 s390x_jscore.diff
 blacklist-diginotar-cert.diff
 openssl_no_ssl2.patch
diff -Nru qt4-x11-4.7.4/debian/rules qt4-x11-4.7.4/debian/rules
--- qt4-x11-4.7.4/debian/rules	2012-03-24 22:03:29.000000000 +0000
+++ qt4-x11-4.7.4/debian/rules	2012-05-09 23:26:27.000000000 +0100
@@ -43,7 +43,7 @@
 	armv6_architectures += armel
 endif
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures)))
-	extra_configure_opts += -arch armv6
+	extra_configure_opts += -arch armv6 -no-neon
 endif
 
 gles2_architectures := none_for_now