diff --git a/ChangeLog b/ChangeLog
index 2fdb49f032..02af86933e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 15 06:00:56 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (rb_thread_mark): update comment about marking `me'
+	  [ruby-core:64340] [ruby-core:64341]
+
 Fri Aug 15 05:53:59 2014  Eric Wong  <e@80x24.org>
 
 	* README.EXT: preliminary documentation for RB_GC_GUARD
diff --git a/vm.c b/vm.c
index f9a2c3df5b..cd80729fde 100644
--- a/vm.c
+++ b/vm.c
@@ -2008,7 +2008,8 @@ rb_thread_mark(void *ptr)
 		    rb_gc_mark(RUBY_VM_NORMAL_ISEQ_P(iseq) ? iseq->self : (VALUE)iseq);
 		}
 		if (cfp->me) {
-		    /* TODO: marking `me' can be more sophisticated way */
+		    /* bitmap marking `me' does not seem worth the trouble:
+		     * [ruby-core:64340] [ruby-core:64341] */
 		    ((rb_method_entry_t *)cfp->me)->mark = 1;
 		    rb_mark_method_entry(cfp->me);
 		}