diff -Nru collectd-5.12.0/debian/changelog collectd-5.12.0/debian/changelog
--- collectd-5.12.0/debian/changelog	2021-01-02 20:09:49.000000000 +0000
+++ collectd-5.12.0/debian/changelog	2021-01-10 11:01:20.000000000 +0000
@@ -1,3 +1,10 @@
+collectd (5.12.0-4+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>  Sun, 10 Jan 2021 11:01:20 +0000
+
 collectd (5.12.0-4) unstable; urgency=medium
 
   * [b96d62e] Fix test_smart for big-endian.
diff -Nru collectd-5.12.0/debian/rules collectd-5.12.0/debian/rules
--- collectd-5.12.0/debian/rules	2021-01-02 20:09:49.000000000 +0000
+++ collectd-5.12.0/debian/rules	2021-01-10 11:01:20.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