diff --git a/ChangeLog b/ChangeLog
index d1e500dd1e..2db23ffe90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 12 06:06:09 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (proc_invoke): fix class name in warning message for
+	  define_method.  [ruby-dev:22235]
+
 Thu Dec 11 21:24:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_pkcs12.[ch]: new files. add OpenSSL::PKCS12.
diff --git a/eval.c b/eval.c
index 5e88cf5176..a09c753e02 100644
--- a/eval.c
+++ b/eval.c
@@ -7124,8 +7124,10 @@ proc_invoke(proc, args, self, klass)
     volatile int pcall, avalue = Qtrue;
 
     if (rb_block_given_p() && ruby_frame->last_func) {
+	if (klass != ruby_frame->last_class)
+	    klass = rb_obj_class(proc);
 	rb_warning("block for %s#%s is useless",
-		   rb_obj_classname(proc),
+		   rb_class2name(klass),
 		   rb_id2name(ruby_frame->last_func));
     }