diff --git a/lib/util-iso-chroot.sh b/lib/util-iso-chroot.sh
index 325896f..2e5eaf1 100644
--- a/lib/util-iso-chroot.sh
+++ b/lib/util-iso-chroot.sh
@@ -263,92 +263,3 @@ chroot_clean(){
     rm -rf --one-file-system "$dest"
 }
 
-prepare_initcpio(){
-    msg2 "Copying initcpio ..."
-    local dest="$1"
-    cp /etc/initcpio/hooks/miso* $dest/etc/initcpio/hooks
-    cp /etc/initcpio/install/miso* $dest/etc/initcpio/install
-    cp /etc/initcpio/miso_shutdown $dest/etc/initcpio
-}
-
-prepare_initramfs(){
-    local mnt="$1"
-    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-${os_id}.conf
-    local _kernver=$(cat $mnt/usr/lib/modules/*/version)
-    if [[ -n ${gpgkey} ]]; then
-        su ${OWNER} -c "gpg --export ${gpgkey} >${MT_USERCONFDIR}/gpgkey"
-        exec 17<>${MT_USERCONFDIR}/gpgkey
-    fi
-    MISO_GNUPG_FD=${gpgkey:+17} chroot-run $mnt \
-        /usr/bin/mkinitcpio -k ${_kernver} \
-        -c /etc/mkinitcpio-${os_id}.conf \
-        -g /boot/initramfs.img
-
-    if [[ -n ${gpgkey} ]]; then
-        exec 17<&-
-    fi
-    if [[ -f ${MT_USERCONFDIR}/gpgkey ]]; then
-        rm ${MT_USERCONFDIR}/gpgkey
-    fi
-}
-
-prepare_boot_extras(){
-    local src="$1" dest="$2"
-    cp $src/boot/intel-ucode.img $dest/intel_ucode.img
-    cp $src/usr/share/licenses/intel-ucode/LICENSE $dest/intel_ucode.LICENSE
-    cp $src/boot/memtest86+/memtest.bin $dest/memtest
-    cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
-}
-
-prepare_grub(){
-    local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
-        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub data=$1/usr/share/grub
-
-    prepare_dir ${grub}/${platform}
-
-    cp ${theme}/cfg/*.cfg ${grub}
-
-    cp ${lib}/${platform}/* ${grub}/${platform}
-
-    msg2 "Building %s ..." "${img}"
-
-    grub-mkimage -d ${grub}/${platform} -o ${grub}/${platform}/${img} -O ${platform} -p ${prefix} biosdisk iso9660
-
-    cat ${grub}/${platform}/cdboot.img ${grub}/${platform}/${img} > ${grub}/${platform}/eltorito.img
-
-    case ${target_arch} in
-        'i686')
-            platform=i386-efi
-            img=bootia32.efi
-        ;;
-        'x86_64')
-            platform=x86_64-efi
-            img=bootx64.efi
-        ;;
-    esac
-
-    prepare_dir ${efi}
-    prepare_dir ${grub}/${platform}
-
-    cp ${lib}/${platform}/* ${grub}/${platform}
-
-    msg2 "Building %s ..." "${img}"
-
-    grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
-
-    prepare_dir ${grub}/themes
-    cp -r ${theme}/themes/${os_id}-live ${grub}/themes/
-    cp ${data}/unicode.pf2 ${grub}
-    cp -r ${theme}/{locales,tz} ${grub}
-
-    local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
-    msg2 "Creating fat image of %s ..." "${size}"
-    truncate -s ${size} "${efi_img}"
-    mkfs.fat -n MISO_EFI "${efi_img}" &>/dev/null
-    prepare_dir "${mnt}"
-    mount_img "${efi_img}" "${mnt}"
-    prepare_dir ${mnt}/efi/boot
-    msg2 "Building %s ..." "${img}"
-    grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660
-    umount_img "${mnt}"
-}
diff --git a/lib/util-iso-grub.sh b/lib/util-iso-grub.sh
new file mode 100644
index 0000000..0d92592
--- /dev/null
+++ b/lib/util-iso-grub.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+prepare_initcpio(){
+    msg2 "Copying initcpio ..."
+    local dest="$1"
+    cp /etc/initcpio/hooks/miso* $dest/etc/initcpio/hooks
+    cp /etc/initcpio/install/miso* $dest/etc/initcpio/install
+    cp /etc/initcpio/miso_shutdown $dest/etc/initcpio
+}
+
+prepare_initramfs(){
+    local mnt="$1"
+    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-${os_id}.conf
+    local _kernver=$(cat $mnt/usr/lib/modules/*/version)
+    if [[ -n ${gpgkey} ]]; then
+        su ${OWNER} -c "gpg --export ${gpgkey} >${MT_USERCONFDIR}/gpgkey"
+        exec 17<>${MT_USERCONFDIR}/gpgkey
+    fi
+    MISO_GNUPG_FD=${gpgkey:+17} chroot-run $mnt \
+        /usr/bin/mkinitcpio -k ${_kernver} \
+        -c /etc/mkinitcpio-${os_id}.conf \
+        -g /boot/initramfs.img
+
+    if [[ -n ${gpgkey} ]]; then
+        exec 17<&-
+    fi
+    if [[ -f ${MT_USERCONFDIR}/gpgkey ]]; then
+        rm ${MT_USERCONFDIR}/gpgkey
+    fi
+}
+
+prepare_boot_extras(){
+    local src="$1" dest="$2"
+    cp $src/boot/intel-ucode.img $dest/intel_ucode.img
+    cp $src/usr/share/licenses/intel-ucode/LICENSE $dest/intel_ucode.LICENSE
+    cp $src/boot/memtest86+/memtest.bin $dest/memtest
+    cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
+}
+
+prepare_grub(){
+    local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
+        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub data=$1/usr/share/grub
+
+    prepare_dir ${grub}/${platform}
+
+    cp ${theme}/cfg/*.cfg ${grub}
+
+    cp ${lib}/${platform}/* ${grub}/${platform}
+
+    msg2 "Building %s ..." "${img}"
+
+    grub-mkimage -d ${grub}/${platform} -o ${grub}/${platform}/${img} -O ${platform} -p ${prefix} biosdisk iso9660
+
+    cat ${grub}/${platform}/cdboot.img ${grub}/${platform}/${img} > ${grub}/${platform}/eltorito.img
+
+    case ${target_arch} in
+        'i686')
+            platform=i386-efi
+            img=bootia32.efi
+        ;;
+        'x86_64')
+            platform=x86_64-efi
+            img=bootx64.efi
+        ;;
+    esac
+
+    prepare_dir ${efi}
+    prepare_dir ${grub}/${platform}
+
+    cp ${lib}/${platform}/* ${grub}/${platform}
+
+    msg2 "Building %s ..." "${img}"
+
+    grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
+
+    prepare_dir ${grub}/themes
+    cp -r ${theme}/themes/${os_id}-live ${grub}/themes/
+    cp ${data}/unicode.pf2 ${grub}
+    cp -r ${theme}/{locales,tz} ${grub}
+
+    local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
+    msg2 "Creating fat image of %s ..." "${size}"
+    truncate -s ${size} "${efi_img}"
+    mkfs.fat -n MISO_EFI "${efi_img}" &>/dev/null
+    prepare_dir "${mnt}"
+    mount_img "${efi_img}" "${mnt}"
+    prepare_dir ${mnt}/efi/boot
+    msg2 "Building %s ..." "${img}"
+    grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660
+    umount_img "${mnt}"
+}
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index ceac33e..6617eaa 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -11,6 +11,7 @@
 
 import ${LIBDIR}/util-chroot.sh
 import ${LIBDIR}/util-iso-chroot.sh
+import ${LIBDIR}/util-iso-grub.sh
 import ${LIBDIR}/util-yaml.sh
 
 error_function() {