diff -Nru x264-0.148.2668+gitfd2c324/debian/changelog x264-0.148.2668+gitfd2c324/debian/changelog
--- x264-0.148.2668+gitfd2c324/debian/changelog	2016-05-12 09:19:37.000000000 +0000
+++ x264-0.148.2668+gitfd2c324/debian/changelog	2016-05-20 00:07:43.000000000 +0000
@@ -1,3 +1,13 @@
+x264 (2:0.148.2668+gitfd2c324-1+rpi1) stretch-staging; urgency=medium
+
+  [Changes introduced in 2:0.142.2431+gita5831aa-1+rpi2 by Peter Michael Green]
+  * Revert previous raspbian changes (not all of which were mentioned
+    in the changelog, start again from debian source)
+  * Pass --disable-asm for static build to prevent it being
+    armv7/neon contaminated.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 20 May 2016 00:07:43 +0000
+
 x264 (2:0.148.2668+gitfd2c324-1) unstable; urgency=medium
 
   [ Sebastian Ramacher ]
diff -Nru x264-0.148.2668+gitfd2c324/debian/confflags x264-0.148.2668+gitfd2c324/debian/confflags
--- x264-0.148.2668+gitfd2c324/debian/confflags	2016-01-18 18:57:53.000000000 +0000
+++ x264-0.148.2668+gitfd2c324/debian/confflags	2016-05-20 00:07:43.000000000 +0000
@@ -25,7 +25,6 @@
 endif
 
 # XXX why isn't --enable-visualize used in the static build?
-# TODO --disable-asm when we build an opt flavor?
 static_confflags += \
 	$(common_confflags) \
 	--enable-static \
@@ -152,6 +151,7 @@
 do_opt := yes
 opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
 shared_confflags += --disable-asm
+static_confflags += --disable-asm
 endif
 endif