diff --git a/debian/changelog b/debian/changelog
index ce4b8e64..1709a4f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-livecd-rootfs (2.399) UNRELEASED; urgency=medium
+livecd-rootfs (2.399) xenial; urgency=medium
 
+  [ Oliver Grawert ]
   * live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:
     kill the snappy os build if the initramfs-tools-ubuntu-core package
     is not found
@@ -7,6 +8,10 @@ livecd-rootfs (2.399) UNRELEASED; urgency=medium
   * skip kernel snap an device tarball builds for s390x and ppc64el
   * drop listing of the device tarballs, this was only for debugging
 
+  [ Adam Conrad ]
+  * live-build/ubuntu-cpc/hooks/032-disk-image.binary: Install s390-tools
+    and sysconfig-hardware before we attempt to configure zipl.
+
  -- Oliver Grawert <ogra@ubuntu.com>  Sun, 10 Apr 2016 17:23:05 +0200
 
 livecd-rootfs (2.398) xenial; urgency=medium
diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
index bc0a1777..386fbe3b 100755
--- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
@@ -115,6 +115,7 @@ fi
 
 if [ "$ARCH" = "s390x" ]; then
     # Do ZIPL install bits
+    chroot mountpoint apt-get -qqy install s390-tools sysconfig-hardware
 
     # Write out cloudy zipl.conf for future kernel updates
     cat << EOF > mountpoint/etc/zipl.conf