diff -Nru x264-0.159.2999+git296494a/debian/changelog x264-0.159.2999+git296494a/debian/changelog
--- x264-0.159.2999+git296494a/debian/changelog	2020-07-12 16:46:44.000000000 +0000
+++ x264-0.159.2999+git296494a/debian/changelog	2020-07-23 20:26:51.000000000 +0000
@@ -1,3 +1,16 @@
+x264 (2:0.159.2999+git296494a-2+rpi1) bullseye-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.
+
+  [Changes introduced in 2:0.159.2999+git296494a-2+rpi1 by Peter Michael Green]
+  * Fix build with make 4.2
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 23 Jul 2020 20:26:51 +0000
+
 x264 (2:0.159.2999+git296494a-2) unstable; urgency=medium
 
   * Team upload
diff -Nru x264-0.159.2999+git296494a/debian/confflags x264-0.159.2999+git296494a/debian/confflags
--- x264-0.159.2999+git296494a/debian/confflags	2018-08-28 21:13:27.000000000 +0000
+++ x264-0.159.2999+git296494a/debian/confflags	2020-07-23 20:26:51.000000000 +0000
@@ -22,7 +22,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 \
@@ -141,6 +140,7 @@
 do_opt := yes
 opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
 shared_confflags += --disable-asm
+static_confflags += --disable-asm
 endif
 endif
 
diff -Nru x264-0.159.2999+git296494a/debian/rules x264-0.159.2999+git296494a/debian/rules
--- x264-0.159.2999+git296494a/debian/rules	2020-06-21 13:42:57.000000000 +0000
+++ x264-0.159.2999+git296494a/debian/rules	2020-07-23 20:26:51.000000000 +0000
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 
-libx264N := libx264-$(shell awk '/#define X264_BUILD/{print $$3}' x264.h)
+# GNU make 4.3 changes the escaping rules for the hash sign, the reccomended
+# way to maintain compatibility with both 4.2 and 4.3 is to use a variable
+# see https://lwn.net/Articles/810071/
+HASHDEFINE:=\#define
+libx264N := libx264-$(shell awk '/$(HASHDEFINE) X264_BUILD/{print $$3}' x264.h)
 
 include /usr/share/dpkg/architecture.mk
 include debian/confflags