diff --git a/ChangeLog b/ChangeLog
index 7fa2dbab1..a1d503c04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-19  David S. Miller  <davem@davemloft.net>
+
+	* loader/sparc64/ieee1275/linux.c: Include grub/command.h
+	(grub_rescue_cmd_linux): Rename to...
+	(grub_cmd_linux): and fix prototype.
+	(grub_rescue_cmd_initrd): Rename to...
+	(grub_cmd_initrd): and fix prototype.
+	(cmd_linux, cmd_initrd): New.
+	(GRUB_MOD_INIT(linux)): Use grub_register_command().
+	(GRUB_MOD_FINI(linux): Use grub_unregister_command().
+
 2009-04-17  Pavel Roskin  <proski@gnu.org>
 
 	* bus/usb/ohci.c (grub_ohci_transaction): Fix incorrect printf
diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 4912b9775..4f5b3cee8 100644
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -27,6 +27,7 @@
 #include <grub/ieee1275/ieee1275.h>
 #include <grub/machine/loader.h>
 #include <grub/gzio.h>
+#include <grub/command.h>
 
 static grub_dl_t my_mod;
 
@@ -281,8 +282,9 @@ grub_linux_load64 (grub_elf_t elf)
   return grub_elf64_load (elf, offset_phdr, 0, 0);
 }
 
-void
-grub_rescue_cmd_linux (int argc, char *argv[])
+static grub_err_t
+grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+		int argc, char *argv[])
 {
   grub_file_t file = 0;
   grub_elf_t elf = 0;
@@ -360,10 +362,13 @@ out:
       initrd_addr = 0;
       loaded = 1;
     }
+
+  return grub_errno;
 }
 
-void
-grub_rescue_cmd_initrd (int argc, char *argv[])
+static grub_err_t
+grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+		 int argc, char *argv[])
 {
   grub_file_t file = 0;
   grub_ssize_t size;
@@ -421,6 +426,8 @@ grub_rescue_cmd_initrd (int argc, char *argv[])
  fail:
   if (file)
     grub_file_close (file);
+
+  return grub_errno;
 }
 
 static void
@@ -495,20 +502,22 @@ fetch_translations (void)
 }
 
 
+static grub_command_t cmd_linux, cmd_initrd;
+
 GRUB_MOD_INIT(linux)
 {
   determine_phys_base ();
   fetch_translations ();
 
-  grub_rescue_register_command ("linux", grub_rescue_cmd_linux,
-				"load a linux kernel");
-  grub_rescue_register_command ("initrd", grub_rescue_cmd_initrd,
-				"load an initrd");
+  cmd_linux = grub_register_command ("linux", grub_cmd_linux,
+				     0, "load a linux kernel");
+  cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
+				      0, "load an initrd");
   my_mod = mod;
 }
 
 GRUB_MOD_FINI(linux)
 {
-  grub_rescue_unregister_command ("linux");
-  grub_rescue_unregister_command ("initrd");
+  grub_unregister_command (cmd_linux);
+  grub_unregister_command (cmd_initrd);
 }