diff -Nru libgav1-0.16.3/debian/changelog libgav1-0.16.3/debian/changelog
--- libgav1-0.16.3/debian/changelog	2021-08-15 17:09:06.000000000 +0000
+++ libgav1-0.16.3/debian/changelog	2021-08-27 07:26:52.000000000 +0000
@@ -1,3 +1,11 @@
+libgav1 (0.16.3-2+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 0.16.0-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Nov 2020 15:07:47 +0000]
+  * Link with libatomic on armhf too.
+  * Update symbols file for raspbian.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Aug 2021 07:26:52 +0000
+
 libgav1 (0.16.3-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru libgav1-0.16.3/debian/libgav1-0.symbols libgav1-0.16.3/debian/libgav1-0.symbols
--- libgav1-0.16.3/debian/libgav1-0.symbols	2020-11-15 22:12:19.000000000 +0000
+++ libgav1-0.16.3/debian/libgav1-0.symbols	2021-08-27 07:26:52.000000000 +0000
@@ -24,13 +24,12 @@
  _ZN7libgav17DecoderD2Ev@Base 0.16.0
  (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Base 0.16.0
  (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.16.0
- (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.16.0
+ (optional=notriscv64andprobabllynotraspbin)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.16.0
  (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.16.0
- (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.16.0
+ (optional=notriscv64andprobabllynotraspbin)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.16.0
  (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 0.16.0
  (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.16.0
- (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.16.0
+ (optional=notriscv64andprobabllynotraspbin)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.16.0
  (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.16.0
- (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.16.0
- (c++|arch-bits=32)"libgav1::Decoder::EnqueueFrame(unsigned char const*, unsigned int, long long, void*)@Base" 0.16.0
+ (optional=notriscv64andprobabllynotraspbin)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.16.0
  (c++|arch-bits=64)"libgav1::Decoder::EnqueueFrame(unsigned char const*, unsigned long, long, void*)@Base" 0.16.0
diff -Nru libgav1-0.16.3/debian/rules libgav1-0.16.3/debian/rules
--- libgav1-0.16.3/debian/rules	2021-08-15 17:07:41.000000000 +0000
+++ libgav1-0.16.3/debian/rules	2021-08-27 07:26:52.000000000 +0000
@@ -9,7 +9,7 @@
 EXTRA_CONFIG_FLAGS =
 
 # try to fix FTBFS on mipsel
-ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc powerpcspe sh4))
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k mips mipsel powerpc powerpcspe sh4))
   export DEB_LDFLAGS_MAINT_APPEND=-latomic
 endif