diff --git a/share/templates.d/99-generic/live/s390.tmpl b/share/templates.d/99-generic/live/s390.tmpl
index ec3c2e24..f0f96df7 100644
--- a/share/templates.d/99-generic/live/s390.tmpl
+++ b/share/templates.d/99-generic/live/s390.tmpl
@@ -21,9 +21,9 @@ from pylorax.sysutils import joinpaths
 
 # Test the runtime_img, if it is > 4GiB we need to set -iso-level to 3
 if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
-    isoargs = "-iso-level 3"
+    udfargs = "-allow-limited-size"
 else:
-    isoargs = ""
+    udfargs = ""
 %>
 
 mkdir ${LIVEDIR}
@@ -80,10 +80,10 @@ runcmd mk-s390-cdboot -i ${outroot}/${KERNELDIR}/kernel.img \
                       -o ${outroot}/${BOOTDIR}/cdboot.img
 
 ## make boot.iso
-runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \
+runcmd mkisofs -o ${outroot}/images/boot.iso \
        -b ${BOOTDIR}/cdboot.img -c ${BOOTDIR}/boot.cat \
        -boot-load-size 4 -no-emul-boot \
-       -R -J -V '${isolabel}' -graft-points \
+       -R -J -V '${isolabel}' ${udfargs} -graft-points \
        ${BOOTDIR}=${outroot}/${BOOTDIR} \
        ${LIVEDIR}=${outroot}/${LIVEDIR} \
        ${filegraft}