diff -Nru trafficserver-8.0.8+ds/debian/changelog trafficserver-8.0.8+ds/debian/changelog
--- trafficserver-8.0.8+ds/debian/changelog	2020-07-29 06:40:43.000000000 +0000
+++ trafficserver-8.0.8+ds/debian/changelog	2020-08-12 22:26:34.000000000 +0000
@@ -1,3 +1,10 @@
+trafficserver (8.0.8+ds-2+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 8.0.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 19 Jan 2019 12:42:48 +0000]
+  * Use -latomic on raspbian too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Aug 2020 22:26:34 +0000
+
 trafficserver (8.0.8+ds-2) unstable; urgency=medium
 
   * Backport upstream patch to fix FTBFS with Sphinx >= 3.0 (Closes: #963664)
diff -Nru trafficserver-8.0.8+ds/debian/rules trafficserver-8.0.8+ds/debian/rules
--- trafficserver-8.0.8+ds/debian/rules	2020-07-29 06:40:43.000000000 +0000
+++ trafficserver-8.0.8+ds/debian/rules	2020-08-12 22:26:34.000000000 +0000
@@ -7,8 +7,8 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -O3
 export DEB_CXXFLAGS_MAINT_APPEND = -O3
-# mips & mipsel need explicit libatomic link
-ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),mips mipsel))
+# mips & mipsel and raspbian need explicit libatomic link
+ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),mips mipsel armhf))
   export DEB_LDFLAGS_MAINT_APPEND += -latomic
 endif