diff -Nru haproxy-2.2.17/debian/changelog haproxy-2.2.17/debian/changelog
--- haproxy-2.2.17/debian/changelog	2021-09-09 17:42:08.000000000 +0000
+++ haproxy-2.2.17/debian/changelog	2021-09-22 19:16:13.000000000 +0000
@@ -1,3 +1,10 @@
+haproxy (2.2.17-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 1.8.19-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 14 Mar 2019 20:25:01 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Sep 2021 19:16:13 +0000
+
 haproxy (2.2.17-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru haproxy-2.2.17/debian/rules haproxy-2.2.17/debian/rules
--- haproxy-2.2.17/debian/rules	2021-09-09 17:42:08.000000000 +0000
+++ haproxy-2.2.17/debian/rules	2021-09-22 19:16:13.000000000 +0000
@@ -33,7 +33,7 @@
 	MAKEARGS+= USE_REGPARM=1
 endif
 
-ifneq ($(filter armel mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),)
+ifneq ($(filter armel armhf mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),)
 	MAKEARGS+= ADDLIB="-latomic -Wl,--no-as-needed -lgcc_s -Wl,--as-needed"
 else
 	MAKEARGS+= ADDLIB="-Wl,--no-as-needed -lgcc_s -Wl,--as-needed"