diff --git a/ChangeLog b/ChangeLog
index a6974c5411..2222a51258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  6 15:55:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (ivar_i): need to support class local instance
+	  variables.
+
 Tue Feb  6 15:44:11 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* compile.c (iseq_compile_each): fix setting is_local flag.
diff --git a/variable.c b/variable.c
index be94d4314e..504e93e0cc 100644
--- a/variable.c
+++ b/variable.c
@@ -985,7 +985,7 @@ rb_ivar_defined(VALUE obj, ID id)
 static int
 ivar_i(ID key, struct global_entry *entry, VALUE ary)
 {
-    if (rb_is_instance_id(key)) {
+    if (rb_is_instance_id(key) || rb_is_instance2_id(key)) {
 	rb_ary_push(ary, ID2SYM(key));
     }
     return ST_CONTINUE;