diff -Nru akonadi-21.12.3/debian/changelog akonadi-21.12.3/debian/changelog
--- akonadi-21.12.3/debian/changelog	2022-04-01 20:08:57.000000000 +0000
+++ akonadi-21.12.3/debian/changelog	2022-04-10 17:06:51.000000000 +0000
@@ -1,3 +1,10 @@
+akonadi (4:21.12.3-2+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 4:20.04.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 07 Jun 2020 20:57:50 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Apr 2022 17:06:51 +0000
+
 akonadi (4:21.12.3-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff -Nru akonadi-21.12.3/debian/rules akonadi-21.12.3/debian/rules
--- akonadi-21.12.3/debian/rules	2022-03-13 15:46:01.000000000 +0000
+++ akonadi-21.12.3/debian/rules	2022-04-10 17:06:51.000000000 +0000
@@ -4,7 +4,7 @@
 
 include /usr/share/dpkg/pkg-info.mk
 
-ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mipsel powerpc sh4))
+ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel m68k mipsel powerpc sh4))
 	export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif