diff --git a/ChangeLog b/ChangeLog
index cfaf8e2277..1b2cb8e272 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 23 17:40:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (warn_balanced): no warning for singleton class.
+	  [ruby-core:30366]
+
 Sun May 23 16:56:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress
diff --git a/parse.y b/parse.y
index e69318be08..63fac21284 100644
--- a/parse.y
+++ b/parse.y
@@ -6484,7 +6484,8 @@ 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_ENDFN && \
+    (last_state != EXPR_CLASS && last_state != EXPR_DOT && \
+     last_state != EXPR_FNAME && last_state != EXPR_ENDFN && \
      space_seen && !ISSPACE(c) && \
      (ambiguous_operator(op, syn), 0))