diff -Nru fplll-5.4.1/debian/changelog fplll-5.4.1/debian/changelog
--- fplll-5.4.1/debian/changelog	2021-08-22 06:37:20.000000000 +0000
+++ fplll-5.4.1/debian/changelog	2021-09-02 20:25:33.000000000 +0000
@@ -1,3 +1,10 @@
+fplll (5.4.1-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 5.3.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 11 Jan 2020 01:35:53 +0000]
+  * Use -latomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 20:25:33 +0000
+
 fplll (5.4.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru fplll-5.4.1/debian/rules fplll-5.4.1/debian/rules
--- fplll-5.4.1/debian/rules	2021-08-22 06:37:20.000000000 +0000
+++ fplll-5.4.1/debian/rules	2021-09-02 20:25:33.000000000 +0000
@@ -5,7 +5,7 @@
 # for which I thank:
 # - ARM Ltd for hosting
 # - Marvell Technology Group Ltd for the hardware
-ifneq (,$(findstring $(DEB_HOST_ARCH),armel mipsel m68k powerpc sh4))
+ifneq (,$(findstring $(DEB_HOST_ARCH),armel armhf mipsel m68k powerpc sh4))
 export DEB_LDFLAGS_MAINT_APPEND=-latomic
 endif