diff -Nru gpac-2.0.0+dfsg1/debian/changelog gpac-2.0.0+dfsg1/debian/changelog
--- gpac-2.0.0+dfsg1/debian/changelog	2022-02-25 19:59:30.000000000 +0000
+++ gpac-2.0.0+dfsg1/debian/changelog	2022-03-04 15:32:49.000000000 +0000
@@ -1,3 +1,13 @@
+gpac (2.0.0+dfsg1-2+rpi1) bookworm-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.
+
+  [changes introduced in 1.0.1+dfsg1-4+rpi1+deb11u1 by Peter Michael Green]
+  * Remove .gitattributes, it causes problems for dgit.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Mar 2022 15:32:49 +0000
+
 gpac (2.0.0+dfsg1-2) unstable; urgency=medium
 
   * Team upload
diff -Nru gpac-2.0.0+dfsg1/debian/patches/remove-.gitattributes-it-causes-problems.patch gpac-2.0.0+dfsg1/debian/patches/remove-.gitattributes-it-causes-problems.patch
--- gpac-2.0.0+dfsg1/debian/patches/remove-.gitattributes-it-causes-problems.patch	1970-01-01 00:00:00.000000000 +0000
+++ gpac-2.0.0+dfsg1/debian/patches/remove-.gitattributes-it-causes-problems.patch	2022-03-04 15:32:49.000000000 +0000
@@ -0,0 +1,36 @@
+From: root <root@manualdev>
+Date: Thu, 2 Sep 2021 15:12:47 +0000
+X-Dgit-Generated: 1.0.1+dfsg1-4+rpi1+deb11u1 00f518aa8732927961df237d70488ba8f254ecf5
+Subject: Remove .gitattributes, it causes problems for dgit.
+
+
+---
+
+--- gpac-1.0.1+dfsg1.orig/.gitattributes
++++ /dev/null
+@@ -1,25 +0,0 @@
+-* text=auto
+-
+-*.c text
+-*.cpp text
+-*.h text
+-*.ttx text
+-Makefile text
+-
+-#unix
+-*.sh text eol=lf
+-configure text eol=lf
+-
+-#windows
+-*.bat text eol=crlf
+-*.sln text eol=crlf
+-*.vcproj text eol=crlf
+-*.vcxproj text eol=crlf
+-*.dsp text eol=crlf
+-*.dsw text eol=crlf
+-
+-#tests
+-tests/media/xmlin4/input.txt text eol=crlf
+-tests/media/xmlin4/input.xml text eol=lf
+-tests/media/laser/*.xml text eol=lf
+-tests/media/ttml/ebu-ttd_sample.ttml text eol=lf
diff -Nru gpac-2.0.0+dfsg1/debian/patches/series gpac-2.0.0+dfsg1/debian/patches/series
--- gpac-2.0.0+dfsg1/debian/patches/series	2022-02-24 22:56:17.000000000 +0000
+++ gpac-2.0.0+dfsg1/debian/patches/series	2022-03-04 15:32:49.000000000 +0000
@@ -1,2 +1,3 @@
 gcc-optflags.patch
 dont-err-build-on-uknown-system.patch
+remove-.gitattributes-it-causes-problems.patch
diff -Nru gpac-2.0.0+dfsg1/debian/rules gpac-2.0.0+dfsg1/debian/rules
--- gpac-2.0.0+dfsg1/debian/rules	2022-02-24 23:00:33.000000000 +0000
+++ gpac-2.0.0+dfsg1/debian/rules	2022-03-04 15:32:49.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