diff --git a/ChangeLog b/ChangeLog
index bcebb8ce39..4415eeb842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 30 21:54:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (program, yycompile0): too early to drop lex_lastline in
+	  rules.
+
 Sun Dec 30 19:23:23 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* bootstraptest/test_knownbug.rb: support DOSISH.
diff --git a/parse.y b/parse.y
index 70c66b70f7..c1ce8a7462 100644
--- a/parse.y
+++ b/parse.y
@@ -765,8 +765,6 @@ program		:  {
 			$$ = $2;
 			parser->result = dispatch1(program, $$);
 		    %*/
-			lex_p = lex_pbeg = lex_pend = 0;
-			lex_lastline = lex_nextline = 0;
 		    }
 		;
 
@@ -4685,6 +4683,8 @@ yycompile0(VALUE arg, int tracing)
     compile_for_eval = 0;
 
     lex_strterm = 0;
+    lex_p = lex_pbeg = lex_pend = 0;
+    lex_lastline = lex_nextline = 0;
     if (parser->nerr) {
 	return 0;
     }