diff --git a/ChangeLog b/ChangeLog
index 44b6613c0f..8449c57d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug  3 15:16:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_include): should always call Enumerable#include?
+	  (not #===) for non numeric end points.  [ruby-core:08477]
+	  [ruby-core:08496]
+
 Mon Jul 31 16:51:40 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (exit_handler): new function; release winsock and
diff --git a/range.c b/range.c
index 96eb2614e8..a7f8e44b37 100644
--- a/range.c
+++ b/range.c
@@ -11,6 +11,7 @@
 **********************************************************************/
 
 #include "ruby.h"
+#include "env.h"
 
 VALUE rb_cRange;
 static ID id_cmp, id_succ, id_beg, id_end, id_excl;
@@ -637,6 +638,7 @@ range_include(VALUE range, VALUE val)
 	}
 	return Qfalse;
     }
+    ruby_frame->this_func = rb_intern("include?");
     return rb_call_super(1, &val);
 }