diff --git a/ChangeLog b/ChangeLog
index 051ef54d39..c478670893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 28 09:43:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (warn_balanced): do not warn for EXPR_ENDFN.
+
 Tue Apr 27 23:57:04 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* eval.c (ruby_cleanup): add exception guard around code running
diff --git a/parse.y b/parse.y
index 2a05211d49..7c53b56d64 100644
--- a/parse.y
+++ b/parse.y
@@ -6488,7 +6488,7 @@ parser_prepare(struct parser_params *parser)
 #define ambiguous_operator(op, syn) dispatch2(operator_ambiguous, ripper_intern(op), rb_str_new_cstr(syn))
 #endif
 #define warn_balanced(op, syn) \
-    (last_state != EXPR_DOT && last_state != EXPR_FNAME && \
+    (last_state != EXPR_DOT && last_state != EXPR_FNAME && last_state != EXPR_ENDFN && \
      space_seen && !ISSPACE(c) && \
      (ambiguous_operator(op, syn), 0))