diff --git a/ChangeLog b/ChangeLog
index 63e0ec8de1..b2354efdaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Aug  6 15:44:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_eq): deals with optimized method
+	  properly.  [ruby-core:24789]
+
+Thu Aug  6 13:30:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/mkmf/base.rb (TestMkmf): was turned into a class, because
+	  MiniUnit doesn't complain even if a testcase has no tests.
+
 Thu Aug  6 13:00:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (check_sizeof): added optional compiler option
diff --git a/vm_method.c b/vm_method.c
index 407b5b7254..4a94504ca5 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -795,6 +795,8 @@ rb_method_entry_eq(const rb_method_entry_t *m1, const rb_method_entry_t *m2)
       case VM_METHOD_TYPE_NOTIMPLEMENTED:
       case VM_METHOD_TYPE_UNDEF:
 	return 1;
+      case VM_METHOD_TYPE_OPTIMIZED:
+	return m1->body.optimize_type == m2->body.optimize_type;
       default:
 	rb_bug("rb_add_method: unsupported method type (%d)\n", m1->type);
 	return 0;