diff --git a/ChangeLog b/ChangeLog
index 0de71a3fc4..b212d02146 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 30 21:10:59 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* parse.y (yylex): use strncmp instead of strcmp. 
+	  accept "__END__\r\n".  ([ruby-dev:19241])
+
 Mon Dec 30 19:10:30 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* ext/extmk.rb: split --make argument contains options, assume
diff --git a/parse.y b/parse.y
index 8e76254a77..f98d6583e7 100644
--- a/parse.y
+++ b/parse.y
@@ -4321,8 +4321,8 @@ yylex()
 	    }
 	}
 	tokfix();
-	if (strcmp(tok(), "__END__") == 0 &&
-	    lex_p - lex_pbeg == 7 &&
+	if (strncmp(tok(), "__END__", 7) == 0 &&
+	    (lex_p - lex_pbeg == 7 || lex_p - lex_pbeg == 8) &&
 	    (lex_pend == lex_p || *lex_p == '\n' || *lex_p == '\r')) {
 	    ruby__end__seen = 1;
 	    lex_lastline = 0;