diff --git a/ChangeLog b/ChangeLog
index 6cad8b0e714184..59dffcea1cb406 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun  7 14:53:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* eval.c (method_inspect): show proper class name.
+	  [ruby-talk:248647], Thanks Calamitas.
+
 Mon May 28 19:37:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (move_to_next_entry): revert r12338. not necessary
diff --git a/eval.c b/eval.c
index 5a1a7ed75e9c6b..520eb987af1326 100644
--- a/eval.c
+++ b/eval.c
@@ -9377,8 +9377,12 @@ method_inspect(method)
     else {
 	rb_str_buf_cat2(str, rb_class2name(data->rklass));
 	if (data->rklass != data->klass) {
+	    VALUE klass = data -> klass;
+	    if (TYPE(klass) == T_ICLASS) {
+		klass = RBASIC(klass)->klass;
+	    }
 	    rb_str_buf_cat2(str, "(");
-	    rb_str_buf_cat2(str, rb_class2name(data->klass));
+	    rb_str_buf_cat2(str, rb_class2name(klass));
 	    rb_str_buf_cat2(str, ")");
 	}
     }
diff --git a/version.h b/version.h
index 6feb792651c664..409713292ca139 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.5"
 #define RUBY_RELEASE_DATE "2007-05-28"
 #define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070528
-#define RUBY_PATCHLEVEL 51
+#define RUBY_RELEASE_CODE 20070607
+#define RUBY_PATCHLEVEL 52
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 6
+#define RUBY_RELEASE_DAY 7
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];