diff -Nru supermin-5.2.1/debian/changelog supermin-5.2.1/debian/changelog
--- supermin-5.2.1/debian/changelog	2021-08-23 12:26:58.000000000 +0000
+++ supermin-5.2.1/debian/changelog	2021-08-29 20:59:16.000000000 +0000
@@ -1,3 +1,16 @@
+supermin (5.2.1-5+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 5.1.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 05:45:23 +0000]
+  * Build-depend on raspbian kernel rather than debian armmp kernel.
+
+  [changes brought forward from 5.1.20-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 03 Dec 2019 01:42:22 +0000]
+  * Drop linux-image-rpi build-dependency, we currently don't have kernels
+    in raspbian bullseye.
+  * Disable testsuite.
+  * Fix clean target.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sun, 29 Aug 2021 20:59:16 +0000
+
 supermin (5.2.1-5) unstable; urgency=medium
 
   [ Simon McVittie ]
diff -Nru supermin-5.2.1/debian/control supermin-5.2.1/debian/control
--- supermin-5.2.1/debian/control	2021-02-02 21:58:47.000000000 +0000
+++ supermin-5.2.1/debian/control	2021-08-29 20:59:16.000000000 +0000
@@ -16,7 +16,6 @@
  augeas-tools, libhivex-bin,
  linux-image-alpha-generic [alpha],
  linux-image-marvell [armel] | linux-image-versatile [armel],
- linux-image-armmp [armhf],
  linux-image-arm64 [arm64],
  linux-image-4kc-malta [mips mipsel] | linux-image-5kc-malta [mips mipsel],
  linux-image-5kc-malta [mips64 mips64el],
diff -Nru supermin-5.2.1/debian/rules supermin-5.2.1/debian/rules
--- supermin-5.2.1/debian/rules	2021-08-23 12:25:28.000000000 +0000
+++ supermin-5.2.1/debian/rules	2021-08-29 20:59:16.000000000 +0000
@@ -24,11 +24,15 @@
 	dh_auto_build
 
 override_dh_auto_test:
-	dh_auto_test -- SKIP_TEST_EXECSTACK=1
+	#dh_auto_test -- SKIP_TEST_EXECSTACK=1
 
 override_dh_gencontrol:
 	dh_gencontrol -- -Vmisc:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(if $(shell which musl-gcc),musl-tools,libc-dev-bin))"
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f src/.depend src/pod2htmd.tmp
+
 override_dh_dwz:
 	dh_dwz -X/usr/bin/supermin