diff --git a/.gitmodules b/.gitmodules
index e3b62df..3f1dbf0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,6 @@
 	path = bootloader
 	url = https://gitlab.redox-os.org/redox-os/bootloader.git
 	branch = master
-[submodule "bootloader-efi"]
-	path = bootloader-efi
-	url = https://gitlab.redox-os.org/redox-os/bootloader-efi.git
-	branch = master
 [submodule "cookbook"]
 	path = cookbook
 	url = https://gitlab.redox-os.org/redox-os/cookbook.git
diff --git a/bootloader b/bootloader
index 5de0a90..8c7bb57 160000
--- a/bootloader
+++ b/bootloader
@@ -1 +1 @@
-Subproject commit 5de0a9076bfd5d84c26183ac9fe0372df84137fa
+Subproject commit 8c7bb57ef3e546f828ba8324b2e566dad0b7cf74
diff --git a/bootloader-efi b/bootloader-efi
deleted file mode 160000
index b7f853a..0000000
--- a/bootloader-efi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b7f853a6aa6a8f2da90d142ae1024832c9268f98
diff --git a/mk/bootloader.mk b/mk/bootloader.mk
index 736b4a5..58e1a20 100644
--- a/mk/bootloader.mk
+++ b/mk/bootloader.mk
@@ -6,6 +6,14 @@ build/bootloader.bin: bootloader/build/$(BOOTLOADER_TARGET)/bootloader.bin
 	mkdir -p build
 	cp -v $< $@
 
+bootloader/build/$(EFI_TARGET)/bootloader.efi: FORCE
+	env --unset=RUST_TARGET_PATH --unset=RUSTUP_TOOLCHAIN --unset=XARGO_RUST_SRC \
+	$(MAKE) -C bootloader build/$(EFI_TARGET)/bootloader.efi TARGET=$(EFI_TARGET)
+
+build/bootloader.efi: bootloader/build/$(EFI_TARGET)/bootloader.efi
+	mkdir -p build
+	cp -v $< $@
+
 bootloader-coreboot/build/bootloader: build/kernel_coreboot
 	env --unset=RUST_TARGET_PATH --unset=RUSTUP_TOOLCHAIN --unset=XARGO_RUST_SRC \
 	$(MAKE) -C bootloader-coreboot clean build/bootloader KERNEL="$(ROOT)/$<"
@@ -13,11 +21,3 @@ bootloader-coreboot/build/bootloader: build/kernel_coreboot
 build/coreboot.elf: bootloader-coreboot/build/bootloader
 	mkdir -p build
 	cp -v $< $@
-
-bootloader-efi/build/$(EFI_TARGET)/boot.efi: FORCE
-	env --unset=RUST_TARGET_PATH --unset=RUSTUP_TOOLCHAIN --unset=XARGO_RUST_SRC \
-	$(MAKE) -C bootloader-efi build/$(EFI_TARGET)/boot.efi TARGET=$(EFI_TARGET)
-
-build/bootloader.efi: bootloader-efi/build/$(EFI_TARGET)/boot.efi
-	mkdir -p build
-	cp -v $< $@