diff --git a/ChangeLog b/ChangeLog
index aa7eff401b..554f56686c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 16 22:24:17 2007  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (garbage_collect): re-introduce ruby_current_node marking code.
+	  [ruby-dev:31005]
+
 Sat Jun 16 21:37:43 2007  Tanaka Akira  <akr@fsij.org>
 
 	* gc.c (gc_sweep): re-introduce heap extension strategy change.
diff --git a/gc.c b/gc.c
index 38097ef2da..bb37b1ee55 100644
--- a/gc.c
+++ b/gc.c
@@ -1376,6 +1376,8 @@ garbage_collect(void)
 
     init_mark_stack();
 
+    gc_mark((VALUE)ruby_current_node, 0);
+
     th->vm->self ? rb_gc_mark(th->vm->self) : rb_vm_mark(th->vm);
 
     if (finalizer_table) {