diff -Nru x264-0.142.2431+gita5831aa/debian/changelog x264-0.142.2431+gita5831aa/debian/changelog
--- x264-0.142.2431+gita5831aa/debian/changelog	2014-07-11 01:21:53.000000000 +0000
+++ x264-0.142.2431+gita5831aa/debian/changelog	2016-03-24 15:10:23.000000000 +0000
@@ -1,3 +1,12 @@
+x264 (2:0.142.2431+gita5831aa-1+rpi2) jessie-staging; urgency=medium
+
+  * 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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Mar 2016 14:16:53 +0000
+
 x264 (2:0.142.2431+gita5831aa-1) unstable; urgency=low
 
   * Update to new upstream snapshot
diff -Nru x264-0.142.2431+gita5831aa/debian/confflags x264-0.142.2431+gita5831aa/debian/confflags
--- x264-0.142.2431+gita5831aa/debian/confflags	2014-07-11 01:13:07.000000000 +0000
+++ x264-0.142.2431+gita5831aa/debian/confflags	2016-03-24 15:35:08.000000000 +0000
@@ -21,7 +21,6 @@
 common_confflags += --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 # 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 \
@@ -145,6 +144,7 @@
 do_opt := yes
 opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
 shared_confflags += --disable-asm
+static_confflags += --disable-asm
 endif
 endif