diff --git a/ChangeLog.lexer-rewrite b/ChangeLog.lexer-rewrite
index 9b2ab9e2f..24d009d14 100644
--- a/ChangeLog.lexer-rewrite
+++ b/ChangeLog.lexer-rewrite
@@ -1,3 +1,8 @@
+2010-02-10  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* script/lexer.c (grub_script_lexer_record_stop): Fix off-by-one
+	bug.
+
 2010-01-25  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* script/yylex.l: Accept parenthesis as part of word.
diff --git a/script/lexer.c b/script/lexer.c
index caefdb7a7..42a570348 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -76,7 +76,7 @@ grub_script_lexer_record_stop (struct grub_parser_param *parser)
     while (*end && grub_isspace (*end)) end--;
     if (*end == '}') end--;
     while (*end && grub_isspace (*end)) end--;
-    *end = '\0';
+    end[1] = '\0';
 
     return start;
   }