diff -Nru polybar-3.5.4/debian/changelog polybar-3.5.4/debian/changelog
--- polybar-3.5.4/debian/changelog	2021-01-07 13:56:45.000000000 +0000
+++ polybar-3.5.4/debian/changelog	2021-01-14 23:10:04.000000000 +0000
@@ -1,3 +1,10 @@
+polybar (3.5.4-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 3.5.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 13 Dec 2020 08:52:59 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Jan 2021 23:10:04 +0000
+
 polybar (3.5.4-1) unstable; urgency=medium
 
   * New upstream version 3.5.4
diff -Nru polybar-3.5.4/debian/rules polybar-3.5.4/debian/rules
--- polybar-3.5.4/debian/rules	2020-12-21 19:31:27.000000000 +0000
+++ polybar-3.5.4/debian/rules	2021-01-14 23:10:04.000000000 +0000
@@ -2,7 +2,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all reproducible=+fixfilepath
 
-ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel sh4))
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k mips mipsel sh4))
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif