diff -Nru poedit-3.1/debian/changelog poedit-3.1/debian/changelog
--- poedit-3.1/debian/changelog	2022-06-10 11:14:23.000000000 +0000
+++ poedit-3.1/debian/changelog	2022-07-21 14:31:35.000000000 +0000
@@ -1,3 +1,10 @@
+poedit (3.1-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 3.0.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 01 May 2022 11:16:49 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 Jul 2022 14:31:35 +0000
+
 poedit (3.1-1) unstable; urgency=medium
 
   * New upstream version 3.1
diff -Nru poedit-3.1/debian/rules poedit-3.1/debian/rules
--- poedit-3.1/debian/rules	2021-07-19 07:13:12.000000000 +0000
+++ poedit-3.1/debian/rules	2022-07-21 14:31:35.000000000 +0000
@@ -8,7 +8,7 @@
 	export CXXFLAGS += -mxgot
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH),armel mipsel m68k powerpc riscv64 sh4))
+ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf mipsel m68k powerpc riscv64 sh4))
 export LDFLAGS += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif