diff --git a/ChangeLog b/ChangeLog
index 326f62129..80ef35c62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/script/lexer.c (grub_script_lexer_yywrap): Update len
+	synchronously with line.
+
 2015-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Replace explicit sizeof divisions by ARRAY_SIZE.
diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
index 128d23822..89cf67706 100644
--- a/grub-core/script/lexer.c
+++ b/grub-core/script/lexer.c
@@ -164,6 +164,7 @@ grub_script_lexer_yywrap (struct grub_parser_param *parserstate,
     {
       grub_free (line);
       line = grub_strdup ("\n");
+      len = 1;
     }
   else if (len && line[len - 1] != '\n')
     {