diff --git a/ChangeLog b/ChangeLog
index 7bc887a7a5..9430c678c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 24 19:00:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (warn_balanced, parser_yylex): no warnings after closing
+	  parens.
+
 Mon May 24 12:52:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (change), tool/change_maker.rb: make a brief template
diff --git a/parse.y b/parse.y
index 63fac21284..b230edfa46 100644
--- a/parse.y
+++ b/parse.y
@@ -6486,6 +6486,7 @@ parser_prepare(struct parser_params *parser)
 #define warn_balanced(op, syn) \
     (last_state != EXPR_CLASS && last_state != EXPR_DOT && \
      last_state != EXPR_FNAME && last_state != EXPR_ENDFN && \
+     last_state != EXPR_ENDARG && \
      space_seen && !ISSPACE(c) && \
      (ambiguous_operator(op, syn), 0))
 
@@ -7252,7 +7253,7 @@ parser_yylex(struct parser_params *parser)
 	COND_LEXPOP();
 	CMDARG_LEXPOP();
 	if (c == ')')
-	    lex_state = EXPR_END;
+	    lex_state = EXPR_ENDFN;
 	else
 	    lex_state = EXPR_ENDARG;
 	return c;