diff -Nru 0ad-0.0.25b/debian/changelog 0ad-0.0.25b/debian/changelog
--- 0ad-0.0.25b/debian/changelog	2022-03-28 11:29:22.000000000 +0000
+++ 0ad-0.0.25b/debian/changelog	2022-04-08 09:12:14.000000000 +0000
@@ -1,3 +1,11 @@
+0ad (0.0.25b-2+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 0.0.25b-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 07 Sep 2021 08:50:57 +0000]
+  * Link with libatomic.
+  * Fix clean target.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 08 Apr 2022 09:12:14 +0000
+
 0ad (0.0.25b-2) unstable; urgency=medium
 
   * Team upload
diff -Nru 0ad-0.0.25b/debian/patches/link-libatomic.patch 0ad-0.0.25b/debian/patches/link-libatomic.patch
--- 0ad-0.0.25b/debian/patches/link-libatomic.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0ad-0.0.25b/debian/patches/link-libatomic.patch	2022-04-08 09:12:14.000000000 +0000
@@ -0,0 +1,62 @@
+Description:  Link with libatomic.
+Author: Peter Michael Green <plugwash@raspbian.org>
+Last-Update: 2021-09-07
+
+Index: 0ad-0.0.25b/build/premake/premake5/build/gmake2.unix/Premake5.make
+===================================================================
+--- 0ad-0.0.25b.orig/build/premake/premake5/build/gmake2.unix/Premake5.make
++++ 0ad-0.0.25b/build/premake/premake5/build/gmake2.unix/Premake5.make
+@@ -38,7 +38,7 @@ OBJDIR = obj/Release/Premake5
+ DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra
+ ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector
+-LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm -ldl -lrt
++LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm -ldl -lrt -latomic
+ LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a
+ ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic
+ 
+@@ -49,7 +49,7 @@ OBJDIR = obj/Debug/Premake5
+ DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
+ ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
+-LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm -ldl -lrt
++LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm -ldl -lrt -latomic
+ LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a
+ ALL_LDFLAGS += $(LDFLAGS) -rdynamic
+ 
+Index: 0ad-0.0.25b/build/premake/premake5.lua
+===================================================================
+--- 0ad-0.0.25b.orig/build/premake/premake5.lua
++++ 0ad-0.0.25b/build/premake/premake5.lua
+@@ -1062,6 +1062,7 @@ function setup_main_exe ()
+ 			links {
+ 				-- Dynamic libraries (needed for linking for gold)
+ 				"dl",
++				"atomic",
+ 			}
+ 		end
+ 
+@@ -1261,6 +1262,7 @@ function setup_collada_project(project_n
+ 
+ 		links {
+ 			"dl",
++			"atomic",
+ 		}
+ 
+ 		-- FCollada is not aliasing-safe, so disallow dangerous optimisations
+@@ -1279,6 +1281,7 @@ function setup_collada_project(project_n
+ 		if os.getversion().description == "GNU/kFreeBSD" then
+ 			links {
+ 				"dl",
++				"atomic",
+ 			}
+ 		end
+ 
+@@ -1423,6 +1426,7 @@ function setup_tests()
+ 			links {
+ 				-- Dynamic libraries (needed for linking for gold)
+ 				"dl",
++				"atomic",
+ 			}
+ 		end
+ 
diff -Nru 0ad-0.0.25b/debian/patches/series 0ad-0.0.25b/debian/patches/series
--- 0ad-0.0.25b/debian/patches/series	2022-03-28 11:29:22.000000000 +0000
+++ 0ad-0.0.25b/debian/patches/series	2022-04-08 09:12:14.000000000 +0000
@@ -4,3 +4,4 @@
 Fix-build-mozjs-on-armhf.patch
 fix-build-mozjs-with-python-3.10.patch
 fix-build-atlas-gcc11-glibc-2.35.patch
+link-libatomic.patch
diff -Nru 0ad-0.0.25b/debian/rules 0ad-0.0.25b/debian/rules
--- 0ad-0.0.25b/debian/rules	2022-03-28 11:29:22.000000000 +0000
+++ 0ad-0.0.25b/debian/rules	2022-04-08 09:12:14.000000000 +0000
@@ -31,6 +31,7 @@
 	rm -rf libraries/source/spidermonkey/mozjs-78.6.0
 	rm -f libraries/source/nvtt/lib/*.so
 	rm -f source/ps/tests/stub_impl_hack.cpp
+	rm -rf libraries/source/cxxtest-4.4/python/python3/cxxtest/__pycache__
 	dh_auto_clean
 
 override_dh_auto_build: