diff -Nru libav-11~beta1/debian/changelog libav-11~beta1/debian/changelog
--- libav-11~beta1/debian/changelog	2014-08-30 15:02:45.000000000 +0000
+++ libav-11~beta1/debian/changelog	2014-09-06 13:50:07.000000000 +0000
@@ -1,3 +1,11 @@
+libav (6:11~beta1-2+rpi1) jessie-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>  Sat, 06 Sep 2014 13:49:44 +0000
+
 libav (6:11~beta1-2) unstable; urgency=medium
 
   [ Reinhard Tartler ]
diff -Nru libav-11~beta1/debian/confflags libav-11~beta1/debian/confflags
--- libav-11~beta1/debian/confflags	2014-08-10 17:17:38.000000000 +0000
+++ libav-11~beta1/debian/confflags	2014-09-06 13:51:22.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,12 +98,13 @@
 # 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-avserver
+confflags += --disable-armv6t2 --disable-neon
 
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has