diff --git a/ChangeLog b/ChangeLog
index f16eab8e27..b882a899a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 16 14:37:57 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_eval.c (rb_mod_module_eval): fix the documentation of
+	  class_eval to mention class variable lookup.  [ruby-core:40649]
+	  [Bug #5544]
+
 Fri Mar 16 14:27:11 2012  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* vm_eval.c (rb_mod_module_eval): fix the documentation of
diff --git a/vm_eval.c b/vm_eval.c
index f9eef4288a..3487f2026f 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1380,10 +1380,10 @@ rb_obj_instance_exec(int argc, VALUE *argv, VALUE self)
  *     mod.module_eval {|| block }                     -> obj
  *
  *  Evaluates the string or block in the context of _mod_, except that when
- *  a block is given, constant lookup is not affected. This can be used to
- *  add methods to a class. <code>module_eval</code> returns the result of
- *  evaluating its argument. The optional _filename_ and _lineno_ parameters
- *  set the text for error messages.
+ *  a block is given, constant/class variable lookup is not affected. This
+ *  can be used to add methods to a class. <code>module_eval</code> returns
+ *  the result of evaluating its argument. The optional _filename_ and
+ *  _lineno_ parameters set the text for error messages.
  *
  *     class Thing
  *     end