diff -Nru volk-2.0.0/debian/changelog volk-2.0.0/debian/changelog
--- volk-2.0.0/debian/changelog	2019-11-15 03:47:23.000000000 +0000
+++ volk-2.0.0/debian/changelog	2019-11-20 05:46:20.000000000 +0000
@@ -1,3 +1,10 @@
+volk (2.0.0-3+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 20 Sep 2015 20:30:19 +0000]
+  * Disable neon.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Nov 2019 05:46:20 +0000
+
 volk (2.0.0-3) unstable; urgency=medium
 
   * update to v2.0.0-4-gf04a46f
diff -Nru volk-2.0.0/debian/patches/disable-neon volk-2.0.0/debian/patches/disable-neon
--- volk-2.0.0/debian/patches/disable-neon	1970-01-01 00:00:00.000000000 +0000
+++ volk-2.0.0/debian/patches/disable-neon	2019-11-20 05:46:20.000000000 +0000
@@ -0,0 +1,28 @@
+Description: Disable neon.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+
+--- volk-2.0.0.orig/lib/CMakeLists.txt
++++ volk-2.0.0/lib/CMakeLists.txt
+@@ -284,9 +284,9 @@ endif(neon_compile_result)
+ ########################################################################
+ # if building Debian armel, eliminate neon
+ ########################################################################
+-if(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi")
+-    OVERRULE_ARCH(neon "Architecture is not armhf")
+-endif(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi")
++#if(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi")
++    OVERRULE_ARCH(neon "We don't want neon on raspbian")
++#endif(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi")
+ 
+ ########################################################################
+ # implement overruling in the ORC case,
+@@ -457,7 +457,7 @@ if((${CMAKE_VERSION} VERSION_GREATER "2.
+   # set up the assembler flags and include the source files
+   foreach(ARCH ${ASM_ARCHS_AVAILABLE})
+       string(REGEX MATCH "${ARCH}" ASM_ARCH "${available_archs}")
+-    if( ASM_ARCH STREQUAL "neonv7" )
++    if( ASM_ARCH STREQUAL "neonv7xxxxx" )
+       message(STATUS "---- Adding ASM files") # we always use ATT syntax
+       message(STATUS "-- Detected neon architecture; enabling ASM")
+       # setup architecture specific assembler flags
diff -Nru volk-2.0.0/debian/patches/series volk-2.0.0/debian/patches/series
--- volk-2.0.0/debian/patches/series	2019-11-15 03:44:07.000000000 +0000
+++ volk-2.0.0/debian/patches/series	2019-11-20 05:46:20.000000000 +0000
@@ -4,3 +4,4 @@
 native-armv7-build-support
 make-acc-happy
 optional-static-apps
+disable-neon