diff --git a/ChangeLog b/ChangeLog
index 530ecf32a..1b53d24f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
-	MErge handling of input and output terminals. Fix a hang.
+	* kern/parser.c (grub_parser_execute): Cope with read-only config.
+
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Merge handling of input and output terminals. Fix a hang.
 
 	* commands/terminal.c (abstract_terminal): New struct.
 	(handle_command): New function. Based on grub_cmd_terminal_input.
diff --git a/kern/parser.c b/kern/parser.c
index 80312b9b4..07597a1a8 100644
--- a/kern/parser.c
+++ b/kern/parser.c
@@ -249,12 +249,11 @@ grub_parser_execute (char *source)
       }
 
     p = grub_strchr (source, '\n');
-    if (p)
-      *p = 0;
 
-    *line = grub_strdup (source);
     if (p)
-      *p = '\n';
+      *line = grub_strndup (source, p - source);
+    else
+      *line = grub_strdup (source);
     source = p ? p + 1 : 0;
     return 0;
   }