diff --git a/ChangeLog b/ChangeLog
index b44a55ef9e..590fc08970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 22 07:25:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): identfier after dot must not be a variable.
+
 Mon Feb 21 10:04:49 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
@@ -101,7 +105,7 @@ Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 Mon Feb 14 13:12:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/openssl/lib/openssl/ssl.rb 
+	* ext/openssl/lib/openssl/ssl.rb
 	 (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
 
 Mon Feb 14 00:40:49 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
diff --git a/parse.y b/parse.y
index 790105c85b..2b41cd558a 100644
--- a/parse.y
+++ b/parse.y
@@ -1554,7 +1554,7 @@ primary		: literal
 			    nd_set_type($$, NODE_UNTIL);
 			}
 		    }
-		| kUNTIL {COND_PUSH(1);} expr_value do {COND_POP();} 
+		| kUNTIL {COND_PUSH(1);} expr_value do {COND_POP();}
 		  compstmt
 		  kEND
 		    {
@@ -3458,7 +3458,7 @@ yylex()
 	if (c == '<' &&
 	    lex_state != EXPR_END &&
 	    lex_state != EXPR_DOT &&
-	    lex_state != EXPR_ENDARG && 
+	    lex_state != EXPR_ENDARG &&
 	    lex_state != EXPR_CLASS &&
 	    (!IS_ARG() || space_seen)) {
 	    int token = heredoc_identifier();
@@ -4334,6 +4334,7 @@ yylex()
 
     {
 	int result = 0;
+	enum lex_state last_state = lex_state;
 
 	switch (tok()[0]) {
 	  case '$':
@@ -4419,6 +4420,7 @@ yylex()
 	}
 	yylval.id = rb_intern(tok());
 	if (is_local_id(yylval.id) &&
+	    last_state != EXPR_DOT &&
 	    ((dyna_in_block() && rb_dvar_defined(yylval.id)) || local_id(yylval.id))) {
 	    lex_state = EXPR_END;
 	}