diff --git a/ChangeLog b/ChangeLog
index edb717377..44e4e6fe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-07-13  Pavel Roskin  <proski@gnu.org>
 
+	* include/grub/i386/coreboot/machine.h: Rename
+	GRUB_MACHINE_LINUXBIOS to GRUB_MACHINE_COREBOOT.
+	* loader/multiboot_loader.c (grub_cmd_multiboot_loader): Allow
+	multiboot 1 for GRUB_MACHINE_COREBOOT and GRUB_MACHINE_QEMU.
+
 	* kern/dl.c: Force native word size to suppress warnings when
 	compiling grub-emu.
 
diff --git a/include/grub/i386/coreboot/machine.h b/include/grub/i386/coreboot/machine.h
new file mode 100644
index 000000000..8b7059005
--- /dev/null
+++ b/include/grub/i386/coreboot/machine.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2007  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_MACHINE_MACHINE_HEADER
+#define GRUB_MACHINE_MACHINE_HEADER	1
+
+#define GRUB_MACHINE_COREBOOT	1
+
+#endif /* ! GRUB_MACHINE_MACHINE_HEADER */
diff --git a/loader/multiboot_loader.c b/loader/multiboot_loader.c
index 29c34d9f8..986ee0b04 100644
--- a/loader/multiboot_loader.c
+++ b/loader/multiboot_loader.c
@@ -139,7 +139,8 @@ grub_cmd_multiboot_loader (grub_command_t cmd __attribute__ ((unused)),
 
   /* XXX Find a better way to identify this.
      This is for i386-pc */
-#if defined(GRUB_MACHINE_PCBIOS) || defined(GRUB_MACHINE_LINUXBIOS)
+#if defined(GRUB_MACHINE_PCBIOS) || defined(GRUB_MACHINE_COREBOOT) || \
+    defined(GRUB_MACHINE_QEMU)
   if (header_multi_ver_found == 1)
     {
       grub_dprintf ("multiboot_loader",
@@ -172,7 +173,8 @@ grub_cmd_module_loader (grub_command_t cmd __attribute__ ((unused)),
 			int argc, char *argv[])
 {
 
-#if defined(GRUB_MACHINE_PCBIOS) || defined(GRUB_MACHINE_LINUXBIOS)
+#if defined(GRUB_MACHINE_PCBIOS) || defined(GRUB_MACHINE_COREBOOT) || \
+    defined(GRUB_MACHINE_QEMU)
   if (module_version_status == 1)
     {
       grub_dprintf("multiboot_loader",