diff -Nru direwolf-1.6+dfsg/debian/changelog direwolf-1.6+dfsg/debian/changelog
--- direwolf-1.6+dfsg/debian/changelog	2022-01-05 10:07:20.000000000 +0000
+++ direwolf-1.6+dfsg/debian/changelog	2022-07-08 17:58:37.000000000 +0000
@@ -1,3 +1,10 @@
+direwolf (1.6+dfsg-2+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 1.6+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Jul 2022 14:48:19 +0000]
+  * Disable neon, it does not appear to be correctly behind runtime CPU detection.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 08 Jul 2022 17:58:37 +0000
+
 direwolf (1.6+dfsg-2) unstable; urgency=medium
 
   [ Daniele Forsi ]
diff -Nru direwolf-1.6+dfsg/debian/patches/disable-neon.patch direwolf-1.6+dfsg/debian/patches/disable-neon.patch
--- direwolf-1.6+dfsg/debian/patches/disable-neon.patch	1970-01-01 00:00:00.000000000 +0000
+++ direwolf-1.6+dfsg/debian/patches/disable-neon.patch	2022-07-08 17:58:37.000000000 +0000
@@ -0,0 +1,33 @@
+Description:  Disable neon, it does not appear to be correctly behind runtime CPU detection.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- direwolf-1.6+dfsg.orig/cmake/modules/FindCPUflags.cmake
++++ direwolf-1.6+dfsg/cmake/modules/FindCPUflags.cmake
+@@ -356,17 +356,17 @@ elseif(ARCHITECTURE_ARM)
+     else()
+         try_run(RUN_NEON COMPILE_NEON "${CMAKE_BINARY_DIR}/tmp" "${TEST_DIR}/test_arm_neon.cxx" COMPILE_DEFINITIONS -mfpu=neon -O0)
+     endif()
+-    if(COMPILE_NEON AND RUN_NEON EQUAL 0)
+-       set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled")
+-       message(STATUS "Use NEON SIMD instructions")
+-       if(C_GCC OR C_CLANG)
+-           set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon" )
+-           set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon" )
+-           add_definitions(-DUSE_NEON)
+-       endif()
+-    else()
++    #if(COMPILE_NEON AND RUN_NEON EQUAL 0)
++    #   set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled")
++    #   message(STATUS "Use NEON SIMD instructions")
++    #   if(C_GCC OR C_CLANG)
++    #       set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon" )
++    #       set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon" )
++    #       add_definitions(-DUSE_NEON)
++    #   endif()
++    #else()
+        set(HAS_NEON OFF CACHE BOOL "Architecture does not have NEON SIMD enabled")
+-    endif()
++    #endif()
+ elseif(ARCHITECTURE_ARM64)
+     # Advanced SIMD (aka NEON) is mandatory for AArch64
+     set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled")
diff -Nru direwolf-1.6+dfsg/debian/patches/series direwolf-1.6+dfsg/debian/patches/series
--- direwolf-1.6+dfsg/debian/patches/series	2022-01-05 10:04:07.000000000 +0000
+++ direwolf-1.6+dfsg/debian/patches/series	2022-07-08 17:58:37.000000000 +0000
@@ -3,3 +3,4 @@
 python3
 desktop-main-category
 lib-udev-rules
+disable-neon.patch