diff -Nru thrift-0.17.0/debian/changelog thrift-0.17.0/debian/changelog
--- thrift-0.17.0/debian/changelog	2022-09-28 17:05:02.000000000 +0000
+++ thrift-0.17.0/debian/changelog	2022-10-05 15:37:09.000000000 +0000
@@ -1,3 +1,10 @@
+thrift (0.17.0-2+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 0.13.0-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 22 Nov 2020 14:00:47 +0000]
+  * Link with libatomic on armhf too for raspbian.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 05 Oct 2022 15:37:09 +0000
+
 thrift (0.17.0-2) unstable; urgency=medium
 
   * Upload to Sid.
diff -Nru thrift-0.17.0/debian/rules thrift-0.17.0/debian/rules
--- thrift-0.17.0/debian/rules	2022-09-28 17:05:02.000000000 +0000
+++ thrift-0.17.0/debian/rules	2022-10-05 15:37:09.000000000 +0000
@@ -11,7 +11,7 @@
 
 export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
 
-ifneq (,$(filter $(DEB_HOST_ARCH), armel mipsel))
+ifneq (,$(filter $(DEB_HOST_ARCH), armel mipsel armhf))
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif