diff -Nru nbdkit-1.12.4/debian/changelog nbdkit-1.12.4/debian/changelog
--- nbdkit-1.12.4/debian/changelog	2019-07-27 09:45:20.000000000 +0000
+++ nbdkit-1.12.4/debian/changelog	2019-08-01 20:03:28.000000000 +0000
@@ -1,3 +1,13 @@
+nbdkit (1.12.4-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 1.10.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 16 Mar 2019 02:09:38 +0000]
+  * Add build-depends on genisoimage, apparently it's pulled in indirectly in
+    Debian but not Raspbian.
+  * Add build-conflicts on ocaml-base-nox, the upstream build auto-detects ocaml
+    resulting in extra files and a FTBFS
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Aug 2019 20:03:28 +0000
+
 nbdkit (1.12.4-1) unstable; urgency=medium
 
   * New upstream version 1.12.4
diff -Nru nbdkit-1.12.4/debian/control nbdkit-1.12.4/debian/control
--- nbdkit-1.12.4/debian/control	2019-07-27 09:45:04.000000000 +0000
+++ nbdkit-1.12.4/debian/control	2019-08-01 20:03:28.000000000 +0000
@@ -28,6 +28,9 @@
  iproute2 <!nocheck>,
  socat <!nocheck>,
  libguestfs-tools <!nocheck>,
+ genisoimage
+Build-Conflicts:
+ ocaml-base-nox
 Standards-Version: 4.4.0
 Homepage: https://github.com/libguestfs/nbdkit
 Vcs-Git: https://salsa.debian.org/debian/nbdkit.git