diff --git a/ChangeLog b/ChangeLog
index 6cdc676af..914a53497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mklayout.c (console_grub_equivalence): Make "layout"
+	a const char *.
+	(argp_parser): Remove unused variable.
+
 2012-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkfont.c (grub_font_info): Make name a const char *.
diff --git a/util/grub-mklayout.c b/util/grub-mklayout.c
index bbd8e98ce..74e08a160 100644
--- a/util/grub-mklayout.c
+++ b/util/grub-mklayout.c
@@ -52,7 +52,7 @@ static struct argp_option options[] = {
 
 struct console_grub_equivalence
 {
-  char *layout;
+  const char *layout;
   grub_uint32_t grub;
 };
 
@@ -419,8 +419,6 @@ argp_parser (int key, char *arg, struct argp_state *state)
      know is a pointer to our arguments structure. */
   struct arguments *arguments = state->input;
 
-  char *p;
-
   switch (key)
     {
     case 'i':