diff --git a/ChangeLog b/ChangeLog
index 714bf9be66..58162ea6c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Oct 13 00:34:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_cvar_defined): wrong id check.  [ruby-core:09158]
+
+	* object.c (rb_mod_cvar_get): typo fixed.  [ruby-core:09168]
+
+	* object.c (rb_mod_cvar_set): ditto.
+
 Wed Oct 11 22:21:41 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest: Merge from trunk; metadata location changed,
diff --git a/object.c b/object.c
index cbadb9c295..5f97357e71 100644
--- a/object.c
+++ b/object.c
@@ -2052,7 +2052,7 @@ rb_mod_cvar_get(obj, iv)
     ID id = rb_to_id(iv);
 
     if (!rb_is_class_id(id)) {
-	rb_name_error(id, "`%s' is not allowed as an class variable name", rb_id2name(id));
+	rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
     }
     return rb_cvar_get(obj, id);
 }
@@ -2085,7 +2085,7 @@ rb_mod_cvar_set(obj, iv, val)
     ID id = rb_to_id(iv);
 
     if (!rb_is_class_id(id)) {
-	rb_name_error(id, "`%s' is not allowed as an class variable name", rb_id2name(id));
+	rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
     }
     rb_cvar_set(obj, id, val, Qfalse);
     return val;
@@ -2111,8 +2111,8 @@ rb_mod_cvar_defined(obj, iv)
 {
     ID id = rb_to_id(iv);
 
-    if (!rb_is_instance_id(id)) {
-	rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
+    if (!rb_is_class_id(id)) {
+	rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
     }
     return rb_cvar_defined(obj, id);
 }