diff -Nru gdu-5.8.1/debian/changelog gdu-5.8.1/debian/changelog
--- gdu-5.8.1/debian/changelog	2021-09-27 18:36:47.000000000 +0000
+++ gdu-5.8.1/debian/changelog	2021-10-13 21:15:58.000000000 +0000
@@ -1,3 +1,10 @@
+gdu (5.8.1-2+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 4.6.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 11:33:59 +0000]
+  * Disable testsuite (I suspect it's a btrfs related failure)
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 13 Oct 2021 21:15:58 +0000
+
 gdu (5.8.1-2) unstable; urgency=medium
 
   * standards bumped to 4.6.0
diff -Nru gdu-5.8.1/debian/rules gdu-5.8.1/debian/rules
--- gdu-5.8.1/debian/rules	2021-09-27 09:58:38.000000000 +0000
+++ gdu-5.8.1/debian/rules	2021-10-13 21:15:58.000000000 +0000
@@ -21,3 +21,6 @@
 
 override_dh_auto_build:
 	dh_auto_build -- -ldflags "$(GOLDFLAGS)"
+
+override_dh_auto_test:
+	echo testsuite disabled