diff --git a/debian/changelog b/debian/changelog
index b51c6ec9..a9209e58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 livecd-rootfs (2.374) UNRELEASED; urgency=medium
 
+  [ Michael Vogt ]
   * ubuntu-core:
     - include the dpkg.list in the device tarball
     - store /usr/share/snappy/dpkg.list manifest on the OS tarball
 
+  [ Dimitri John Ledkov ]
+  * ubuntu-cpc:
+    - exclude s390x from should_install_grub
+
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Jan 2016 18:27:23 +0100
 
 livecd-rootfs (2.373) 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 eebd85f8..bbab9817 100755
--- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
@@ -34,7 +34,7 @@ rmdir mountpoint
 
 should_install_grub() {
     case $architecture in
-        armhf|arm64|s390x)
+        armhf|arm64)
             return 1
             ;;
         *)