diff --git a/ChangeLog b/ChangeLog
index 95dcd51a7..fbfe0ef6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-20  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/grub-mkrawimage.c (usage): Change string formatting to
+	improve gettext.
+
 2010-02-20  Manoel Rebelo Abranches <mrabran@br.ibm.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Add delete and
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 83bb51c02..dd84f2d81 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -446,10 +446,8 @@ Make a bootable image of GRUB.\n\
   -o, --output=FILE       output a generated image to FILE [default=stdout]\n"
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
 	    "\
-  -O, --format=FORMAT     generate an image in format [default=" 
-	    GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT "]\n	\
-	                available formats: "
-	    GRUB_PLATFORM_IMAGE_FORMATS "\n"
+  -O, --format=FORMAT     generate an image in format [default=%s]\n\
+                          available formats: %s\n"
 #endif
 	    "\
   -h, --help              display this message and exit\n\
@@ -457,7 +455,12 @@ Make a bootable image of GRUB.\n\
   -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
-"), program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
+"), 
+program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY,
+#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
+  GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT, GRUB_PLATFORM_IMAGE_FORMATS,
+#endif
+PACKAGE_BUGREPORT);
 
   exit (status);
 }