diff --git a/ChangeLog b/ChangeLog
index 57582a68ec..646e1bc056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr  4 12:29:02 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* error.c (rb_notimplement): should show the name of this func,
+	  not callee.
+
 Wed Apr  4 10:18:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (popen_exec): should not close close-on-exec FDs.
diff --git a/error.c b/error.c
index d296bff06c..2d4bafdf50 100644
--- a/error.c
+++ b/error.c
@@ -1029,7 +1029,7 @@ rb_notimplement(void)
 {
   rb_raise(rb_eNotImpError,
            "The %s() function is unimplemented on this machine",
-	     rb_id2name(rb_frame_callee()));
+	     rb_id2name(rb_frame_this_func()));
 }
 
 void