diff --git a/debian/changelog b/debian/changelog
index f801abe0..7fe8f90b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.483) UNRELEASED; urgency=medium
+
+  * Skip setting up initrd for s390x when it is not generated for the image.
+    This fixes building minimized s390x images.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 14 Nov 2017 18:51:14 +0100
+
 livecd-rootfs (2.482) bionic; urgency=medium
 
   * Remove boot/grub leftovers from our root squashfs, left behind after
diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
index 789bcd00..7989ff6a 100755
--- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
@@ -155,9 +155,9 @@ EOF
         ln -sf initrd.img-* initrd.img
         popd
 
-        ZIPL_EXTRA_PARAMS=--ramdisk=/boot/initrd.img
-
         echo "ramdisk = /boot/initrd.img" >> mountpoint/etc/zipl.conf
+
+        ZIPL_EXTRA_PARAMS=--ramdisk=/boot/initrd.img
     fi
 
     # Create bootmap file