diff --git a/gentpl.py b/gentpl.py
index bbec62413..5b7987390 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -16,6 +16,7 @@ GROUPS["x86"]      = GROUPS["i386"] + GROUPS["x86_64"]
 GROUPS["x86_efi"]  = [ "i386_efi", "x86_64_efi" ]
 
 GROUPS["nopc"] = GRUB_PLATFORMS[:]; GROUPS["nopc"].remove("i386_pc")
+GROUPS["x86_efi_pc"] = GROUPS["x86_efi"] + ["i386_pc"]
 
 GROUPS["x86_noefi"] = GROUPS["x86"][:]; GROUPS["x86_noefi"].remove("i386_efi"); GROUPS["x86_noefi"].remove("x86_64_efi")
 GROUPS["i386_noefi"] = GROUPS["i386"][:]; GROUPS["i386_noefi"].remove("i386_efi")
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index b7c52b9d7..fd07012f7 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -409,7 +409,7 @@ module = {
 
 module = {
   name = cpuid;
-  i386 = commands/i386/cpuid.c;
+  x86 = commands/i386/cpuid.c;
   enable = x86;
 };
 
@@ -1057,12 +1057,12 @@ module = {
 
 module = {
   name = xnu;
-  i386 = loader/xnu_resume.c;
-  i386 = loader/i386/xnu.c;
-  i386 = loader/macho32.c;
-  i386 = loader/macho64.c;
-  i386 = loader/macho.c;
-  i386 = loader/xnu.c;
+  x86_efi_pc = loader/xnu_resume.c;
+  x86_efi_pc = loader/i386/xnu.c;
+  x86_efi_pc = loader/macho32.c;
+  x86_efi_pc = loader/macho64.c;
+  x86_efi_pc = loader/macho.c;
+  x86_efi_pc = loader/xnu.c;
 
   extra_dist = loader/machoXX.c;
   enable = i386_pc;