diff -Nru libgav1-0.18.0/debian/changelog libgav1-0.18.0/debian/changelog
--- libgav1-0.18.0/debian/changelog	2022-07-27 20:50:15.000000000 +0000
+++ libgav1-0.18.0/debian/changelog	2022-08-06 07:48:46.000000000 +0000
@@ -1,3 +1,11 @@
+libgav1 (0.18.0-1+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>  Sat, 06 Aug 2022 07:48:46 +0000
+
 libgav1 (0.18.0-1) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru libgav1-0.18.0/debian/libgav1-0.symbols libgav1-0.18.0/debian/libgav1-0.symbols
--- libgav1-0.18.0/debian/libgav1-0.symbols	1970-01-01 00:00:00.000000000 +0000
+++ libgav1-0.18.0/debian/libgav1-0.symbols	2022-08-06 07:48:46.000000000 +0000
@@ -0,0 +1,35 @@
+# SymbolsHelper-Confirmed: 0.16.0 amd64 armel
+libgav1.so.0 libgav1-0 #MINVER#
+* Build-Depends-Package: libgav1-dev
+ Libgav1ComputeFrameBufferInfo@Base 0.16.0
+ Libgav1DecoderCreate@Base 0.16.0
+ Libgav1DecoderDequeueFrame@Base 0.16.0
+ Libgav1DecoderDestroy@Base 0.16.0
+ Libgav1DecoderEnqueueFrame@Base 0.16.0
+ Libgav1DecoderGetMaxBitdepth@Base 0.16.0
+ Libgav1DecoderSettingsInitDefault@Base 0.16.0
+ Libgav1DecoderSignalEOS@Base 0.16.0
+ Libgav1GetBuildConfiguration@Base 0.16.0
+ Libgav1GetErrorString@Base 0.16.0
+ Libgav1GetVersion@Base 0.16.0
+ Libgav1GetVersionString@Base 0.16.0
+ Libgav1SetFrameBuffer@Base 0.16.0
+ _ZN7libgav17Decoder12DequeueFrameEPPK20Libgav1DecoderBuffer@Base 0.16.0
+ _ZN7libgav17Decoder14GetMaxBitdepthEv@Base 0.16.0
+ _ZN7libgav17Decoder4InitEPKNS_15DecoderSettingsE@Base 0.16.0
+ _ZN7libgav17Decoder9SignalEOSEv@Base 0.16.0
+ _ZN7libgav17DecoderC1Ev@Base 0.16.0
+ _ZN7libgav17DecoderC2Ev@Base 0.16.0
+ _ZN7libgav17DecoderD1Ev@Base 0.16.0
+ _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
+ (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
+ (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
+ (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
+ (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.18.0/debian/rules libgav1-0.18.0/debian/rules
--- libgav1-0.18.0/debian/rules	2022-07-27 20:47:47.000000000 +0000
+++ libgav1-0.18.0/debian/rules	2022-08-06 07:48:46.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