diff -Nru libav-0.8.17/debian/changelog libav-0.8.17/debian/changelog
--- libav-0.8.17/debian/changelog	2016-05-10 10:18:08.000000000 +0000
+++ libav-0.8.17/debian/changelog	2016-05-18 02:11:36.000000000 +0000
@@ -1,3 +1,10 @@
+libav (6:0.8.17-2+rpi1+deb7u1) wheezy-staging; urgency=medium
+
+  [changes brought forward from 6:0.8.17-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 25 Mar 2015 00:22:51 +0000]
+  * Disable build of neon flavour
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 18 May 2016 02:11:35 +0000
+
 libav (6:0.8.17-2+deb7u1) wheezy-security; urgency=high
 
   * debian/patches/CVE-2014-9676.patch: The seg_write_packet function in
diff -Nru libav-0.8.17/debian/confflags libav-0.8.17/debian/confflags
--- libav-0.8.17/debian/confflags	2016-03-02 22:16:19.000000000 +0000
+++ libav-0.8.17/debian/confflags	2016-05-18 02:11: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