diff -Nru libav-9.8/debian/changelog libav-9.8/debian/changelog
--- libav-9.8/debian/changelog	2013-08-13 16:46:11.000000000 +0000
+++ libav-9.8/debian/changelog	2013-10-09 20:26:58.000000000 +0000
@@ -1,3 +1,11 @@
+libav (6:9.8-2+rpi1) wheezy-staging; urgency=low
+
+  * Disable build of neon flavour
+  * Disable armv6t2 and neon for regular flavours
+  * Disable runtime cpu detection
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 09 Oct 2013 08:11:35 +0000
+
 libav (6:9.8-2) unstable; urgency=low
 
   * Upload to unstable
diff -Nru libav-9.8/debian/confflags libav-9.8/debian/confflags
--- libav-9.8/debian/confflags	2013-08-13 16:46:11.000000000 +0000
+++ libav-9.8/debian/confflags	2013-10-09 20:26:44.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
@@ -97,11 +98,12 @@
 # Common configuration flags
 confflags += --arch='$(DEB_HOST_ARCH_CPU)'
 confflags += --enable-pthreads
-confflags += --enable-runtime-cpudetect
+#confflags += --enable-runtime-cpudetect
 confflags += --extra-version='$(DEB_VERSION)'
 confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 confflags += --prefix=/usr
 confflags += $(shell test -x /usr/bin/yasm || echo --disable-yasm )
+confflags += --disable-armv6t2 --disable-neon
 
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has