diff -Nru thrift-0.13.0/debian/changelog thrift-0.13.0/debian/changelog
--- thrift-0.13.0/debian/changelog	2021-02-14 18:50:04.000000000 +0000
+++ thrift-0.13.0/debian/changelog	2021-03-01 15:17:13.000000000 +0000
@@ -1,3 +1,10 @@
+thrift (0.13.0-6+rpi1) bullseye-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>  Mon, 01 Mar 2021 15:17:13 +0000
+
 thrift (0.13.0-6) unstable; urgency=medium
 
   * Backport upstream fix for THRIFT-5322: Go compact_protocol allocating
diff -Nru thrift-0.13.0/debian/rules thrift-0.13.0/debian/rules
--- thrift-0.13.0/debian/rules	2020-10-26 17:01:44.000000000 +0000
+++ thrift-0.13.0/debian/rules	2021-03-01 15:17:13.000000000 +0000
@@ -9,7 +9,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