diff -Nru akonadi-20.08.3/debian/changelog akonadi-20.08.3/debian/changelog
--- akonadi-20.08.3/debian/changelog	2021-04-13 20:30:46.000000000 +0000
+++ akonadi-20.08.3/debian/changelog	2021-05-10 08:06:38.000000000 +0000
@@ -1,3 +1,10 @@
+akonadi (4:20.08.3-3+rpi1) bullseye-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>  Mon, 10 May 2021 08:06:38 +0000
+
 akonadi (4:20.08.3-3) unstable; urgency=medium
 
   * Handle mariadbd_akonadi with dh_apparmor (Closes: #986635).
diff -Nru akonadi-20.08.3/debian/rules akonadi-20.08.3/debian/rules
--- akonadi-20.08.3/debian/rules	2021-04-13 20:10:12.000000000 +0000
+++ akonadi-20.08.3/debian/rules	2021-05-10 08:06:38.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