diff --git a/debian/changelog b/debian/changelog
index ac7979b1..e84ac61a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.597) UNRELEASED; urgency=medium
+
+  * Install s390-tools-zkey into the installer layer for zkey support in
+    subiquity.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 20 Jun 2019 23:25:13 +0100
+
 livecd-rootfs (2.596) eoan; urgency=medium
 
   * Add tzdata to buildd images.  It isn't strictly build-essential, but it
diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index 9da75381..22ee234f 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
@@ -54,6 +54,9 @@ EOF
 
 # Install casper for live session magic.
 chroot $INSTALLER_ROOT apt-get -y install lupin-casper
+if [ `dpkg --print-architecture` = s390x ]; then
+	chroot $INSTALLER_ROOT apt-get -y install s390-tools-zkey
+fi
 chroot $INSTALLER_ROOT apt-get clean
 
 # For bug #1743643 "Install to dirty disk with swap fails" remove the