diff -Nru libvpx-1.4.0/debian/changelog libvpx-1.4.0/debian/changelog
--- libvpx-1.4.0/debian/changelog	2015-06-23 08:10:21.000000000 +0000
+++ libvpx-1.4.0/debian/changelog	2015-06-30 12:08:11.000000000 +0000
@@ -1,3 +1,11 @@
+libvpx (1.4.0-4+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 1.3.0-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 26 Nov 2014 23:15:27 +0000]
+  [Mike Thompson <mpthompson@gmail.com>]
+  * Modified to eliminate ARMv7 NEON build for Raspberry Pi.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 30 Jun 2015 12:08:11 +0000
+
 libvpx (1.4.0-4) unstable; urgency=medium
 
   * debian/rules:
diff -Nru libvpx-1.4.0/debian/rules libvpx-1.4.0/debian/rules
--- libvpx-1.4.0/debian/rules	2015-06-23 08:08:53.000000000 +0000
+++ libvpx-1.4.0/debian/rules	2015-06-30 12:08:11.000000000 +0000
@@ -20,8 +20,9 @@
   --enable-vp9-postproc
 
 ifeq ($(DEB_HOST_ARCH_CPU),arm)
-configure_flags_neon := $(configure_flags) --target=armv7-linux-gcc
-BUILD_NEON=Yes
+# RPI configure_flags_neon := $(configure_flags) --target=armv7-linux-gcc
+# RPI BUILD_NEON=Yes
+BUILD_NEON=No
 endif
 
 ifeq ($(DEB_HOST_ARCH), armel)