diff --git a/ChangeLog b/ChangeLog
index a8d498033..d39c0b65a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/multiboot.c (GRUB_MOD_INIT) [GRUB_USE_MULTIBOOT2]:
+	Rename "module" to "module2".
+	Reported by: Seth Goldberg.
+
 2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/efi/memory.h (grub_machine_mmap_iterate): Remove
diff --git a/loader/multiboot.c b/loader/multiboot.c
index 1a22cd3a6..ce1e75dda 100644
--- a/loader/multiboot.c
+++ b/loader/multiboot.c
@@ -335,14 +335,16 @@ GRUB_MOD_INIT(multiboot)
 #ifdef GRUB_USE_MULTIBOOT2
     grub_register_command ("multiboot2", grub_cmd_multiboot,
 			   0, N_("Load a multiboot 2 kernel."));
+  cmd_module =
+    grub_register_command ("module2", grub_cmd_module,
+			   0, N_("Load a multiboot 2 module."));
 #else
     grub_register_command ("multiboot", grub_cmd_multiboot,
 			   0, N_("Load a multiboot kernel."));
-#endif
-
   cmd_module =
     grub_register_command ("module", grub_cmd_module,
 			   0, N_("Load a multiboot module."));
+#endif
 
   my_mod = mod;
 }