diff -Nru libav-0.8.5/debian/changelog libav-0.8.5/debian/changelog
--- libav-0.8.5/debian/changelog	2013-01-13 11:00:03.000000000 +0000
+++ libav-0.8.5/debian/changelog	2013-01-24 07:45:36.000000000 +0000
@@ -1,3 +1,9 @@
+libav (6:0.8.5-1+rpi1) wheezy-staging; urgency=low
+
+  * Disable build of neon flavour
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Jan 2013 07:45:17 +0000
+
 libav (6:0.8.5-1) unstable; urgency=low
 
   * New upstream security/bugfix release. New releases fixes
diff -Nru libav-0.8.5/debian/confflags libav-0.8.5/debian/confflags
--- libav-0.8.5/debian/confflags	2013-01-13 10:50:42.000000000 +0000
+++ libav-0.8.5/debian/confflags	2013-01-24 07:45:36.000000000 +0000
@@ -47,7 +47,8 @@
     endif
     # only build a NEON flavour if the toolchain doesn't enable NEON by default
     ifneq ($(has_neon),1)
-    FLAVORS += neon
+    #RPI -- don't build neon flavour
+    #FLAVORS += neon
     endif
     # calling-conventions for VFP and NEON flavours: if the toolchain uses
     # -mfloat-abi=soft, we want to use softfp, otherwise we want to use the