diff --git a/commands/efi/memmap.c b/commands/efi/memmap.c
index a3ce82841..d49e02080 100644
--- a/commands/efi/memmap.c
+++ b/commands/efi/memmap.c
@@ -132,12 +132,12 @@ grub_cmd_memmap (struct grub_arg_list *state, int argc, char **args)
 GRUB_MOD_INIT(memmap)
 {
   (void)mod;			/* To stop warning. */
-  grub_register_command ("memmap", grub_cmd_memmap, GRUB_COMMAND_FLAG_BOTH,
-			 "memmap",
-			 "Display memory map.", NULL);
+  grub_register_extcmd ("memmap", grub_cmd_memmap, GRUB_COMMAND_FLAG_BOTH,
+			"memmap",
+			"Display memory map.", NULL);
 }
 
 GRUB_MOD_FINI(memmap)
 {
-  grub_unregister_command ("memmap");
+  grub_unregister_extcmd ("memmap");
 }
diff --git a/commands/efi/systab.c b/commands/efi/systab.c
index 1d90ca9ca..27a2cde83 100644
--- a/commands/efi/systab.c
+++ b/commands/efi/systab.c
@@ -246,13 +246,13 @@ grub_cmd_systab (struct grub_arg_list *state, int argc, char **args)
 
 GRUB_MOD_INIT(systab)
 {
-  (void)mod;			/* To stop warning. */
-  grub_register_command ("systab", grub_cmd_systab, GRUB_COMMAND_FLAG_BOTH,
-			 "systab [NAME]",
-			 "Display EFI system table.", NULL);
+  (void) mod;			/* To stop warning. */
+  grub_register_extcmd ("systab", grub_cmd_systab, GRUB_COMMAND_FLAG_BOTH,
+			"systab [NAME]",
+			"Display EFI system table.", NULL);
 }
 
 GRUB_MOD_FINI(systab)
 {
-  grub_unregister_command ("systab");
+  grub_unregister_extcmd ("systab");
 }