diff -Nru x264-0.148.2601+gita0cd7d3/debian/changelog x264-0.148.2601+gita0cd7d3/debian/changelog
--- x264-0.148.2601+gita0cd7d3/debian/changelog	2015-11-01 18:42:12.000000000 +0000
+++ x264-0.148.2601+gita0cd7d3/debian/changelog	2015-11-28 01:10:41.000000000 +0000
@@ -1,3 +1,10 @@
+x264 (2:0.148.2601+gita0cd7d3-3+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 2:0.142.2431+gita5831aa-1+rpi1 by Peter Michael Green <plugwash@p10link.net> at Fri, 01 Aug 2014 16:25:14 +0000]
+  * Disable build of neon variant
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Nov 2015 01:10:41 +0000
+
 x264 (2:0.148.2601+gita0cd7d3-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru x264-0.148.2601+gita0cd7d3/debian/confflags x264-0.148.2601+gita0cd7d3/debian/confflags
--- x264-0.148.2601+gita0cd7d3/debian/confflags	2015-10-21 11:29:11.000000000 +0000
+++ x264-0.148.2601+gita0cd7d3/debian/confflags	2015-11-28 01:10:41.000000000 +0000
@@ -141,18 +141,23 @@
 ifeq (arm,$(DEB_HOST_GNU_CPU))
 armv6t2_asm := movt r0, \#0
 has_armv6t2 := $(call check_asm, $(armv6t2_asm))
-ifeq ($(has_armv6t2),1)
+#ifeq ($(has_armv6t2),1)
 # extract the actual -march= the toolchain targets
 toolchain_arch := $(shell $(CC) -v 2>&1 | sed -n '/^Configured with: / s/.* --with-arch=\([^ ]*\).*/\1/p')
 ifeq ($(toolchain_arch),)
-toolchain_arch := armv6t2
+toolchain_arch := armv6
 endif
 shared_extra_cflags += -march=$(toolchain_arch)
-else
-do_opt := yes
-opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
 shared_confflags += --disable-asm
-endif
+static_extra_cflags += -march=$(toolchain_arch)
+static_confflags += --disable-asm
+
+do_opt := no
+#else
+#do_opt := yes
+#opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
+#shared_confflags += --disable-asm
+#endif
 endif
 
 # S390 upstream arch, s390 and s390x Debian arches; no upstream flags by