diff -Nru collectd-5.12.0/debian/changelog collectd-5.12.0/debian/changelog
--- collectd-5.12.0/debian/changelog	2021-07-14 12:46:02.000000000 +0000
+++ collectd-5.12.0/debian/changelog	2021-08-07 18:42:28.000000000 +0000
@@ -1,3 +1,10 @@
+collectd (5.12.0-7+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 5.11.0-7+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Sep 2020 14:58:41 +0000]
+  * Use libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Aug 2021 18:42:28 +0000
+
 collectd (5.12.0-7) unstable; urgency=medium
 
   * Team upload.
diff -Nru collectd-5.12.0/debian/rules collectd-5.12.0/debian/rules
--- collectd-5.12.0/debian/rules	2021-06-01 15:56:33.000000000 +0000
+++ collectd-5.12.0/debian/rules	2021-08-07 18:42:28.000000000 +0000
@@ -38,7 +38,7 @@
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
 # grpc workaround
-ifneq (,$(filter $(DEB_HOST_ARCH), armel mips mipsel powerpc))
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf mips mipsel powerpc))
   LDFLAGS += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif