diff -Nru libav-11.4/debian/changelog libav-11.4/debian/changelog
--- libav-11.4/debian/changelog	2015-06-03 20:31:46.000000000 +0000
+++ libav-11.4/debian/changelog	2015-06-12 01:43:34.000000000 +0000
@@ -1,3 +1,14 @@
+libav (6:11.4-2+rpi1) stretch-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>  Fri, 12 Jun 2015 01:43:26 +0000
+
 libav (6:11.4-2) unstable; urgency=medium
 
   * debian/*.lintian-overrides: Use architecture specific overrides to fix
diff -Nru libav-11.4/debian/confflags libav-11.4/debian/confflags
--- libav-11.4/debian/confflags	2015-06-03 20:13:23.000000000 +0000
+++ libav-11.4/debian/confflags	2015-06-12 01:43:34.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)
@@ -46,9 +49,12 @@
     FLAVORS += vfp
     endif
     # only build a NEON flavour if the toolchain doesn't enable NEON by default
+    # and we are not building for Raspbian
     ifneq ($(has_neon),1)
+    ifneq ($(raspbian_derived),1)
     FLAVORS += neon
     endif
+    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
     # toolchain default (either softfp or hardfp)
@@ -104,6 +110,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