diff --git a/ChangeLog b/ChangeLog
index 98d35a2bf3..28702394a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  8 10:44:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (sort_reentered): reentered check may be called from
+	  Array#sort.
+
 Thu May  8 09:51:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (sort_1, sort_2): check for reentered and if elements are
diff --git a/array.c b/array.c
index 8924e4a22e..7219079efe 100644
--- a/array.c
+++ b/array.c
@@ -1443,10 +1443,10 @@ rb_ary_reverse_m(VALUE ary)
 }
 
 static VALUE
-check_reentered(VALUE *klass)
+sort_reentered(VALUE *klass)
 {
     if (*klass) {
-	rb_raise(rb_eRuntimeError, "sort! reentered");
+	rb_raise(rb_eRuntimeError, "sort reentered");
     }
     return Qnil;
 }