diff -Nru gpac-1.0.1+dfsg1/debian/changelog gpac-1.0.1+dfsg1/debian/changelog
--- gpac-1.0.1+dfsg1/debian/changelog	2021-05-25 01:09:10.000000000 +0000
+++ gpac-1.0.1+dfsg1/debian/changelog	2021-06-10 22:48:46.000000000 +0000
@@ -1,3 +1,10 @@
+gpac (1.0.1+dfsg1-4+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 1.0.1+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 12:28:54 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Jun 2021 22:48:46 +0000
+
 gpac (1.0.1+dfsg1-4) unstable; urgency=medium
 
   [ Moritz Muehlenhoff ]
diff -Nru gpac-1.0.1+dfsg1/debian/rules gpac-1.0.1+dfsg1/debian/rules
--- gpac-1.0.1+dfsg1/debian/rules	2021-05-25 01:09:10.000000000 +0000
+++ gpac-1.0.1+dfsg1/debian/rules	2021-06-10 22:48:46.000000000 +0000
@@ -12,7 +12,7 @@
 DEB_EXTRA_CONFIGURE_FLAGS += --cross-prefix=${DEB_HOST_GNU_TYPE}-
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH), armel riscv64))
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf riscv64))
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif