diff --git a/ChangeLog b/ChangeLog
index 48718bda3..def7262f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-fstest.c (options): Replace N with NUM and S with STRING.
+	Gettextize.
+	* util/grub-mount.c (options): Likewise.
+
 2012-03-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/probe.c (options): Replace VAR with VARNAME and
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 24e508f67..5acb680eb 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -448,10 +448,10 @@ static struct argp_option options[] = {
   {N_("xnu_uuid DEVICE"), 0, 0, OPTION_DOC, N_("Compute XNU UUID of the device."), 1},
   
   {"root",      'r', N_("DEVICE_NAME"), 0, N_("Set root device."),                 2},
-  {"skip",      's', "N",           0, N_("Skip N bytes from output file."),   2},
-  {"length",    'n', "N",           0, N_("Handle N bytes in output file."),   2},
-  {"diskcount", 'c', "N",           0, N_("Specify the number of input files."),                   2},
-  {"debug",     'd', "S",           0, N_("Set debug environment variable."),  2},
+  {"skip",      's', N_("NUM"),           0, N_("Skip N bytes from output file."),   2},
+  {"length",    'n', N_("NUM"),           0, N_("Handle N bytes in output file."),   2},
+  {"diskcount", 'c', N_("NUM"),           0, N_("Specify the number of input files."),                   2},
+  {"debug",     'd', N_("STRING"),           0, N_("Set debug environment variable."),  2},
   {"crypto",   'C', NULL, 0, N_("Mount crypto devices."), 2},
   {"zfs-key",      'K',
    /* TRANSLATORS: "prompt" is a keyword.  */
diff --git a/util/grub-mount.c b/util/grub-mount.c
index e0a7edba3..e3eb1d7f3 100644
--- a/util/grub-mount.c
+++ b/util/grub-mount.c
@@ -408,7 +408,7 @@ fuse_init (void)
 
 static struct argp_option options[] = {  
   {"root",      'r', N_("DEVICE_NAME"), 0, N_("Set root device."),                 2},
-  {"debug",     'd', "S",           0, N_("Set debug environment variable."),  2},
+  {"debug",     'd', N_("STRING"),           0, N_("Set debug environment variable."),  2},
   {"crypto",   'C', NULL, 0, N_("Mount crypto devices."), 2},
   {"zfs-key",      'K',
    /* TRANSLATORS: "prompt" is a keyword.  */