diff -Nru juce-6.1.6~ds0/debian/changelog juce-6.1.6~ds0/debian/changelog
--- juce-6.1.6~ds0/debian/changelog	2022-03-18 17:31:11.000000000 +0000
+++ juce-6.1.6~ds0/debian/changelog	2022-03-25 01:59:04.000000000 +0000
@@ -1,3 +1,10 @@
+juce (6.1.6~ds0-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 5.4.4~repack0-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 30 Nov 2019 15:26:20 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Mar 2022 01:59:04 +0000
+
 juce (6.1.6~ds0-1) unstable; urgency=medium
 
   * New upstream version 6.1.6~ds0
diff -Nru juce-6.1.6~ds0/debian/rules juce-6.1.6~ds0/debian/rules
--- juce-6.1.6~ds0/debian/rules	2022-03-18 17:31:11.000000000 +0000
+++ juce-6.1.6~ds0/debian/rules	2022-03-25 01:59:04.000000000 +0000
@@ -31,7 +31,7 @@
 # - https://gcc.gnu.org/wiki/Atomic/GCCMM/LIbrary
 # - the 'clasp' packaging
 # link with libatomic on architectures without built-in atomic
-ifneq ($(strip $(filter $(DEB_HOST_ARCH), armel powerpc powerpcspe m68k mips mipsel sh4 riscv64)),)
+ifneq ($(strip $(filter $(DEB_HOST_ARCH), armel armhf powerpc powerpcspe m68k mips mipsel sh4 riscv64)),)
 	DEB_CPPFLAGS_MAINT_APPEND += -DDEBIAN_JUCERPROJECT_LIBS='"atomic"'
 	DEB_LDFLAGS_MAINT_APPEND += -latomic
 endif