diff --git a/buildiso.sh b/buildiso.sh
index 5debee0..47e61d3 100755
--- a/buildiso.sh
+++ b/buildiso.sh
@@ -153,18 +153,24 @@ build_iso() {
 
     echo -n "Creating LiveCD ISO... "
     pushd ${tempdir}/installer &>/dev/null
-    xorriso -as mkisofs \
-       -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
-       -c isolinux/boot.cat \
-       -b isolinux/isolinux.bin \
-       -no-emul-boot \
-       -boot-load-size 4 \
-       -boot-info-table \
-       -eltorito-alt-boot \
-       -e boot/grub/efi.img \
-       -no-emul-boot \
-       -isohybrid-gpt-basdat \
-       -o ../${isofilename} \
+    xorriso \
+        -as mkisofs \
+        -iso-level 3 \
+        -o ../${isofilename} \
+        -full-iso9660-filenames \
+        -volid "DEBIAN_CUSTOM" \
+        -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
+        -eltorito-boot \
+            isolinux/isolinux.bin \
+            -no-emul-boot \
+            -boot-load-size 4 \
+            -boot-info-table \
+            --eltorito-catalog isolinux/isolinux.cat \
+        -eltorito-alt-boot \
+            -e boot/grub/efi.img \
+            -no-emul-boot \
+            -isohybrid-gpt-basdat \
+        -append_partition 2 0xef boot/grub/efi.img \
        . &>/dev/null || fail "Error creating ISO file."
     popd &>/dev/null
     echo "done."
diff --git a/isolinux.cfg b/isolinux.cfg
index a035cb1..19062ec 100644
--- a/isolinux.cfg
+++ b/isolinux.cfg
@@ -22,7 +22,7 @@ MENU clear
 
 LABEL PVC Live Installer
   linux /live/vmlinuz
-  APPEND initrd=/live/initrd.img boot=live components splash quiet
+  APPEND initrd=/live/initrd.img boot=live splash quiet
 
 LABEL Traditional Debian Installer (graphical)
   linux /d-i/gtk/vmlinuz