diff -Nru libav-11.4/debian/changelog libav-11.4/debian/changelog
--- libav-11.4/debian/changelog	2015-06-04 17:52:47.000000000 +0000
+++ libav-11.4/debian/changelog	2016-02-11 15:59:45.000000000 +0000
@@ -1,3 +1,22 @@
+libav (6:11.4-1~deb8u1+rpi2) jessie-staging; urgency=medium
+
+  * Re-enable specific neon build.
+  * Move armv6t2 and neon disabling from overall configure flags to static
+    and shared configure flags so they don't impact the neon-specific build.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 11 Feb 2016 15:58:25 +0000
+
+libav (6:11.4-1~deb8u1+rpi1) jessie-staging; urgency=medium
+  [changes brought forward from 6:11.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 29 Mar 2015 02:07:33 +0000]
+  * Add special case handling for Raspbian (and any derivatives thereof) (Closes: 738760)
+    + Disable armv6t2
+      - note: the thumb2 variant of arv6 seems to be very rare, the Pi certainly
+        doesn't have it.
+    + Disable neon in the main build.
+    + Don't build a seperate neon flavour either.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 16 Jun 2015 05:02:30 +0000
+
 libav (6:11.4-1~deb8u1) jessie-security; urgency=high
 
   [ Sebastian Ramacher ]
diff -Nru libav-11.4/debian/confflags libav-11.4/debian/confflags
--- libav-11.4/debian/confflags	2015-06-04 17:52:47.000000000 +0000
+++ libav-11.4/debian/confflags	2016-02-11 15:57:45.000000000 +0000
@@ -26,6 +26,9 @@
 # configuration
 check_asm = $(shell echo 'void foo(void) { __asm__ volatile("$(1)"); }' | $(CROSS)gcc -x c -c - -o /dev/null 2>/dev/null && echo 1 || echo 0)
 
+# this is 0 or 1 depending on wehter we build for Raspbian (or a derivative thereof)
+raspbian_derived := $(shell dpkg-vendor --derives-from raspbian && echo 1 || echo 0)
+
 # the other flavors always build dynamic versions
 # Also, disable architecture-specific optimizations for default shared build
 ifeq ($(DEB_HOST_ARCH_CPU),arm)
@@ -104,6 +107,11 @@
 confflags += $(shell test -x /usr/bin/yasm || echo --disable-yasm )
 confflags += --disable-avserver
 
+ifeq ($(raspbian_derived),1)
+# Disable armv6t2 and NEON on Raspbian (and any derivatives thereof)
+confflags += --disable-armv6t2 --disable-neon
+endif
+
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
 # plenty of incompatible assembly; not sure how to detect that properly
@@ -169,6 +177,11 @@
 
 # Configuration flags for the static libraries
 static_build_confflags += $(confflags)
+ifeq ($(raspbian_derived),1)
+# Disable armv6t2 and NEON on Raspbian (and any derivatives thereof)
+static_build_confflags += --disable-armv6t2 --disable-neon
+endif
+
 
 # Configuration flags for the non-optimized shared libraries
 shared_build_confflags += $(confflags) --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
@@ -182,6 +195,11 @@
 ifeq      ($(DEB_HOST_ARCH),i386)
 shared_build_confflags += --cpu='i586'
 endif
+ifeq ($(raspbian_derived),1)
+# Disable armv6t2 and NEON on Raspbian (and any derivatives thereof)
+shared_build_confflags += --disable-armv6t2 --disable-neon
+endif
+
 
 ## specific to arm architectures
 # Configuration flags for the optimised shared libraries