diff --git a/Makefile.am b/Makefile.am
index c3dfcb2..c17d8de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,10 +41,12 @@ gummiboot_SOURCES = \
 	src/setup/efivars.c \
 	src/setup/efivars.h
 
+gummiboot_CPPFLAGS = \
+	-DMACHINE_TYPE_NAME=\"$(MACHINE_TYPE_NAME)\" \
+	-DGUMMIBOOTLIBDIR=\"$(gummibootlibdir)\"
+
 gummiboot_CFLAGS = \
 	$(AM_CFLAGS) \
-	-DMACHINE_TYPE_NAME=\"$(MACHINE_TYPE_NAME)\" \
-	-DGUMMIBOOTLIBDIR=\"$(gummibootlibdir)\" \
 	$(BLKID_CFLAGS)
 
 gummiboot_LDADD = \
@@ -75,7 +77,8 @@ efi_sources = src/efi/gummiboot.c
 efi_cppflags = \
 	-I$(top_builddir) -include config.h \
 	-I/usr/include/efi \
-	-I/usr/include/efi/$(ARCH)
+	-I/usr/include/efi/$(ARCH) \
+	-DMACHINE_TYPE_NAME=\"$(MACHINE_TYPE_NAME)\"
 
 efi_cflags = \
 	-Wall \
diff --git a/src/efi/gummiboot.c b/src/efi/gummiboot.c
index 9f2f31d..123433f 100644
--- a/src/efi/gummiboot.c
+++ b/src/efi/gummiboot.c
@@ -2197,9 +2197,9 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
         config_entry_add_loader_auto(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path,
                                      L"auto-windows", 'w', L"Windows Boot Manager", L"\\EFI\\Microsoft\\Boot\\bootmgfw.efi");
         config_entry_add_loader_auto(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path,
-                                     L"auto-efi-shell", 's', L"EFI Shell", L"\\shellx64.efi");
+                                     L"auto-efi-shell", 's', L"EFI Shell", L"\\shell" MACHINE_TYPE_NAME ".efi");
         config_entry_add_loader_auto(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path,
-                                     L"auto-efi-default", '\0', L"EFI Default Loader", L"\\EFI\\BOOT\\BOOTX64.EFI");
+                                     L"auto-efi-default", '\0', L"EFI Default Loader", L"\\EFI\\BOOT\\BOOT" MACHINE_TYPE_NAME ".EFI");
         config_entry_add_osx(&config);
         efivar_set(L"LoaderEntriesAuto", config.entries_auto, FALSE);