diff --git a/etc/bootloader/grub b/etc/bootloader/grub
index 1717d21..307effb 100644
--- a/etc/bootloader/grub
+++ b/etc/bootloader/grub
@@ -1,6 +1,6 @@
 packages() {
 	if [ "$EFI" == "1" ]; then
-		addpkg grub-x86_64-efi
+		addpkg grub-x86_64-efi efibootmgr
 	else
 		addpkg grub
 	fi
diff --git a/main.sh b/main.sh
index d49f9b6..90b3d67 100644
--- a/main.sh
+++ b/main.sh
@@ -15,6 +15,9 @@ if [ "${DEBUG}" ]; then
 	cryptsetup close /dev/mapper/luks*
 	rm -rf $main
 fi
+if [ "${DEBUG}" == "2" ]; then
+	set -x
+fi
 
 mkdir -p ${target} ${tmp_target}