diff --git a/Makefile b/Makefile
index 8571e8862089fb9d3ad8e3b2c0cb7277cd4f0aa2..d9d003303a7c096ac1dfd75b506bc5e15864f185 100644
--- a/Makefile
+++ b/Makefile
@@ -421,15 +421,10 @@ image_grub_install: $(GRUB_ASSEMBLE_DIR)/grub.x86_64-efi $(GRUB_ASSEMBLE_DIR)/gr
 	$(RSYNC) "/usr/share/grub/themes" "$(IMAGE_DIR)$(GRUB_INSTALL_DIR)/"
 	mkdir -p "$(IMAGE_DIR)$(GRUB_INSTALL_DIR)/fonts"
 	$(RSYNC) "/usr/share/grub/unicode.pf2" "$(IMAGE_DIR)$(GRUB_INSTALL_DIR)/fonts/"
-	#copy efi core files; note that the x64 binary is named grub.efi because grubx64.efi
-	#is occupied by the ubuntu secure boot grub. Furthermore, place a copy in efi/grub
-	#to serve compatibillity with the lipstick grub.cfg
-	#TODO clean up this clutter...
+	#copy efi core files; note that the x64 binary is named grubx64-unsigned.efi because grubx64.efi
+	#is occupied by the ubuntu secure boot grub.
 	mkdir -p "$(IMAGE_DIR)/efi/boot"
-	mkdir -p "$(IMAGE_DIR)/efi/grub"
-	$(RSYNC) --no-p --no-g --no-o "$(GRUB_ASSEMBLE_DIR)/grub.x86_64-efi" "$(IMAGE_DIR)/efi/boot/grub.efi"
-	$(RSYNC) --no-p --no-g --no-o "$(GRUB_ASSEMBLE_DIR)/grub.x86_64-efi" "$(IMAGE_DIR)/efi/grub/grubx64.efi"
-	$(RSYNC) --no-p --no-g --no-o "$(GRUB_ASSEMBLE_DIR)/grub.i386-efi" "$(IMAGE_DIR)/efi/boot/grubia32.efi"
+	$(RSYNC) --no-p --no-g --no-o "$(GRUB_ASSEMBLE_DIR)/grub.x86_64-efi" "$(IMAGE_DIR)/efi/boot/grubx64-unsigned.efi"
 	#our i386 efi bootloader shall be the default:
 	$(RSYNC) --no-p --no-g --no-o "$(GRUB_ASSEMBLE_DIR)/grub.i386-efi" "$(IMAGE_DIR)/efi/boot/bootia32.efi"