diff --git a/ChangeLog b/ChangeLog
index ae1948f65e..ba6a5a9f30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 15 09:20:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_obj_instance_eval): should no singleton classes for
+	  true, false, and nil.  [ruby-dev:28186]
+
 Tue Feb 14 20:26:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* enumerator.c (enumerator_each): return self if no block is
diff --git a/eval.c b/eval.c
index da53f6121b..c2e163452e 100644
--- a/eval.c
+++ b/eval.c
@@ -6546,7 +6546,7 @@ rb_obj_instance_eval(int argc, VALUE *argv, VALUE self)
 {
     VALUE klass;
 
-    if (FIXNUM_P(self) || SYMBOL_P(self)) {
+    if (SPECIAL_CONST_P(self)) {
 	klass = Qnil;
     }
     else {