diff -Nru supermin-5.1.20/debian/changelog supermin-5.1.20/debian/changelog
--- supermin-5.1.20/debian/changelog	2019-01-21 13:09:38.000000000 +0000
+++ supermin-5.1.20/debian/changelog	2019-12-03 01:42:22.000000000 +0000
@@ -1,3 +1,19 @@
+supermin (5.1.20-1+rpi2) bullseye-staging; urgency=medium
+
+  * Drop linux-image-rpi build-dependency, we currently don't have kernels
+    in raspbian bullseye.
+  * Disable testsuite.
+  * Fix clean target.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 03 Dec 2019 01:42:22 +0000
+
+supermin (5.1.20-1+rpi1) buster-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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 30 Jan 2019 23:48:06 +0000
+
 supermin (5.1.20-1) unstable; urgency=medium
 
   * New upstream version 5.1.20
diff -Nru supermin-5.1.20/debian/control supermin-5.1.20/debian/control
--- supermin-5.1.20/debian/control	2019-01-21 13:09:33.000000000 +0000
+++ supermin-5.1.20/debian/control	2019-12-03 01:42:13.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.1.20/debian/rules supermin-5.1.20/debian/rules
--- supermin-5.1.20/debian/rules	2019-01-21 13:09:14.000000000 +0000
+++ supermin-5.1.20/debian/rules	2019-12-03 01:42:22.000000000 +0000
@@ -20,10 +20,14 @@
 	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
+
 %:
 	dh $@ --with=ocaml