diff -Nru suricata-6.0.4/debian/changelog suricata-6.0.4/debian/changelog
--- suricata-6.0.4/debian/changelog	2021-12-14 14:24:47.000000000 +0000
+++ suricata-6.0.4/debian/changelog	2021-12-21 23:10:51.000000000 +0000
@@ -1,3 +1,10 @@
+suricata (1:6.0.4-3+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 1:6.0.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 12:21:01 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Dec 2021 23:10:51 +0000
+
 suricata (1:6.0.4-3) unstable; urgency=medium
 
   * Remove suricata-oinkmaster binary package.
diff -Nru suricata-6.0.4/debian/rules suricata-6.0.4/debian/rules
--- suricata-6.0.4/debian/rules	2021-12-13 21:39:47.000000000 +0000
+++ suricata-6.0.4/debian/rules	2021-12-21 23:10:51.000000000 +0000
@@ -11,7 +11,7 @@
 
 # workaround for linking issue on some archs
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--allow-multiple-definition
-EXTRA_ATOMIC_ARCHS = armel mipsel powerpc
+EXTRA_ATOMIC_ARCHS = armel armhf mipsel powerpc
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(EXTRA_ATOMIC_ARCHS)))
 	DEB_LDFLAGS_MAINT_APPEND += -latomic
 	export DEB_LDFLAGS_MAINT_APPEND