diff -Nru apr-util-1.6.1/debian/changelog apr-util-1.6.1/debian/changelog
--- apr-util-1.6.1/debian/changelog	2017-11-06 18:48:34.000000000 +0000
+++ apr-util-1.6.1/debian/changelog	2018-02-19 01:01:24.000000000 +0000
@@ -1,3 +1,10 @@
+apr-util (1.6.1-1+rpi1) buster-staging; urgency=medium
+
+  * Apply patch from bug 890108 to fix build with new debhelper.
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 19 Feb 2018 01:01:24 +0000
+
 apr-util (1.6.1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru apr-util-1.6.1/debian/rules apr-util-1.6.1/debian/rules
--- apr-util-1.6.1/debian/rules	2017-11-06 18:48:34.000000000 +0000
+++ apr-util-1.6.1/debian/rules	2018-02-19 01:01:15.000000000 +0000
@@ -22,6 +22,11 @@
 # The 'build' target needs special handling because there there is a directory
 # named 'build'.
 .PHONY: build
+# The build target must not be empty.  Sadly because of how make
+# works, we have do duplicate the target in this case.
+build:
+	dh $@ -B$(BUILDDIR) --parallel --with autotools_dev
+
 %:
 	dh $@ -B$(BUILDDIR) --parallel --with autotools_dev
 
@@ -84,7 +89,7 @@
 # test
 #
 
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
 	$(MAKE) -C $(BUILDDIR)/test $(MAKEARGS) all
 	$(MAKE) -C $(BUILDDIR)/test -j1 check