diff -Nru nbdkit-1.1.28/debian/changelog nbdkit-1.1.28/debian/changelog
--- nbdkit-1.1.28/debian/changelog	2018-02-06 17:59:38.000000000 +0000
+++ nbdkit-1.1.28/debian/changelog	2018-02-16 03:33:01.000000000 +0000
@@ -1,3 +1,12 @@
+nbdkit (1.1.28-3+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 1.1.16-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Oct 2017 12:09:47 +0000]
+  * Change kernel build-dep for Raspbian.
+  * Disable testsuite.
+  * Add build-conflicts on ocaml-base-nox
+
+ -- Peter Michael green <plugwash@raspbian.org>  Fri, 16 Feb 2018 03:33:01 +0000
+
 nbdkit (1.1.28-3) unstable; urgency=medium
 
   * Document the need for linux-image-* build dependencies
diff -Nru nbdkit-1.1.28/debian/control nbdkit-1.1.28/debian/control
--- nbdkit-1.1.28/debian/control	2018-02-06 17:59:38.000000000 +0000
+++ nbdkit-1.1.28/debian/control	2018-02-16 03:33:01.000000000 +0000
@@ -16,7 +16,7 @@
  libvirt-dev,
  zlib1g-dev,
  linux-image-marvell [armel] <!nocheck> | linux-image-versatile [armel] <!nocheck>,
- linux-image-armmp [armhf] <!nocheck>,
+ linux-image-rpi [armhf] <!nocheck> | linux-image-rpi2 [armhf] <!nocheck>, 
  linux-image-arm64 [arm64] <!nocheck>,
  linux-image-4kc-malta [mips mipsel] <!nocheck> | linux-image-5kc-malta [mips mipsel mips64 mips64el] <!nocheck>,
  linux-image-s390x [s390x] <!nocheck>,
diff -Nru nbdkit-1.1.28/debian/rules nbdkit-1.1.28/debian/rules
--- nbdkit-1.1.28/debian/rules	2018-01-23 20:46:46.000000000 +0000
+++ nbdkit-1.1.28/debian/rules	2018-02-16 03:33:01.000000000 +0000
@@ -30,3 +30,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