diff --git a/ChangeLog b/ChangeLog
index 17c0347c1..b4478f76f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-01  Bean  <bean123ch@gmail.com>
+
+	* normal/menu_entry.c (editor_getline): Don't return the original
+	string as result, as it will be released by lexer once it has done
+	using it.
+
 2008-08-01  Robert Millan  <rmh@aybabtu.com>
 
 	* util/grub.d/10_linux.in: Use prepare_grub_to_access_device() from
diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index 5faeef07a..a9c17886f 100644
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -996,7 +996,7 @@ run (struct screen *screen)
       linep->len = p - linep->buf;
       for (p = linep->buf; grub_isspace (*p); p++)
 	;
-      *line = p;
+      *line = grub_strdup (p);
       currline++;
       return 0;
     }