diff --git a/Makefile b/Makefile
index 45cd47f37dcd4d35d4fb211c23734c8aa6979aaf..9c3f0b5209462866fc2605853f62e54fd12fc7d9 100644
--- a/Makefile
+++ b/Makefile
@@ -523,7 +523,8 @@ multiboot :
 		|| (umount -d "$(WORKSPACE)/multiboot.work" && exit 1)
 	#since this is most likely a standalone image make the lipck grubx64 the
 	#default bootloader for 64bit efi systems
-	mv "$(WORKSPACE)/multiboot.work/efi/boot/"{grubx64-unsigned.efi,bootx64.efi} \
+	[ -e "$(WORKSPACE)/multiboot.work/efi/boot/bootx64.efi" ] \
+		|| mv "$(WORKSPACE)/multiboot.work/efi/boot/"{grubx64-unsigned.efi,bootx64.efi} \
 		|| (umount -d "$(WORKSPACE)/multiboot.work" && exit 1)
 	$(MAKE) "IMAGE_PART_FILE=$(WORKSPACE)/multiboot.part" IMAGE_FILE=MultiBoot.img \
 		"IMAGE_DIR=$(WORKSPACE)/multiboot.work" \