diff -Nru nbdkit-1.1.16/debian/changelog nbdkit-1.1.16/debian/changelog
--- nbdkit-1.1.16/debian/changelog	2017-10-21 10:07:09.000000000 +0000
+++ nbdkit-1.1.16/debian/changelog	2017-10-26 12:09:47.000000000 +0000
@@ -1,3 +1,11 @@
+nbdkit (1.1.16-1+rpi1) buster-staging; urgency=medium
+
+  * Change kernel build-dep for Raspbian.
+  * Disable testsuite.
+  * Add build-conflicts on ocaml-base-nox
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Oct 2017 12:09:47 +0000
+
 nbdkit (1.1.16-1) unstable; urgency=medium
 
   * New upstream version 1.1.16
diff -Nru nbdkit-1.1.16/debian/control nbdkit-1.1.16/debian/control
--- nbdkit-1.1.16/debian/control	2017-10-21 10:06:44.000000000 +0000
+++ nbdkit-1.1.16/debian/control	2017-10-26 12:09:47.000000000 +0000
@@ -12,7 +12,7 @@
  libguestfs-dev,
  libselinux1-dev,
  linux-image-marvell [armel] | linux-image-versatile [armel],
- linux-image-armmp [armhf],
+ linux-image-rpi | linux-image-rpi2 [armhf],
  linux-image-arm64 [arm64],
  linux-image-4kc-malta [mips mipsel] | linux-image-5kc-malta [mips mipsel mips64 mips64el],
  linux-image-s390x [s390x],
@@ -27,6 +27,8 @@
  python-dev,
  ruby-dev,
  iproute2, socat, libguestfs-tools,
+Build-Conflicts:
+ ocaml-base-nox
 Standards-Version: 4.1.1
 Homepage: https://github.com/libguestfs/nbdkit
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/nbdkit.git
diff -Nru nbdkit-1.1.16/debian/rules nbdkit-1.1.16/debian/rules
--- nbdkit-1.1.16/debian/rules	2017-10-21 10:03:31.000000000 +0000
+++ nbdkit-1.1.16/debian/rules	2017-10-26 12:09:47.000000000 +0000
@@ -13,9 +13,9 @@
 #     "Initialization of device s390-ipl failed: could not find stage1 bootloader"
 # - mipsel, armel, powerpc: test suite hangs:
 #     "Build killed with signal TERM after 150 minutes of inactivity"
-ifneq (,$(findstring $(DEB_HOST_ARCH),s390x armel mipsel powerpc))
+#ifneq (,$(findstring $(DEB_HOST_ARCH),s390x armel mipsel powerpc))
 override_dh_auto_test:
-endif
+#endif
 
 override_dh_install:
 	dh_install -X.la --fail-missing
@@ -25,3 +25,8 @@
 # - pkg-has-shlibs-control-file-but-no-actual-shared-libs
 # - post{inst,rm}-has-useless-call-to-ldconfig
 override_dh_makeshlibs:
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f tests/test1.img
+	rm -f tests/file-data tests/pki/ca-cert.pem tests/pki/ca-key.pem tests/pki/ca.info tests/pki/client-cert.pem tests/pki/client-key.pem tests/pki/client.info tests/pki/server-cert.pem tests/pki/server-key.pem tests/pki/server.info