diff -Nru cmus-2.10.0/debian/changelog cmus-2.10.0/debian/changelog
--- cmus-2.10.0/debian/changelog	2022-07-13 18:40:37.000000000 +0000
+++ cmus-2.10.0/debian/changelog	2022-07-24 09:32:22.000000000 +0000
@@ -1,3 +1,10 @@
+cmus (2.10.0-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 2.8.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 19 Aug 2020 09:42:31 +0000]
+  * Add armhf to list of libatomic architectures.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Jul 2022 09:32:22 +0000
+
 cmus (2.10.0-1) unstable; urgency=medium
 
   * Team upload
diff -Nru cmus-2.10.0/debian/rules cmus-2.10.0/debian/rules
--- cmus-2.10.0/debian/rules	2022-07-13 18:40:37.000000000 +0000
+++ cmus-2.10.0/debian/rules	2022-07-24 09:32:22.000000000 +0000
@@ -11,7 +11,7 @@
 #    ./track_info.c:47: undefined reference to `__atomic_fetch_add_8'
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935678
 # Depends on 13-atomic_ld.patch
-ifneq (,$(findstring $(DEB_BUILD_ARCH), armel m68k mipsel powerpc sh4))
+ifneq (,$(findstring $(DEB_BUILD_ARCH), armhf armel m68k mipsel powerpc sh4))
 export LDLIBS += -latomic
 endif