diff --git a/ChangeLog b/ChangeLog
index fca0e57337..c6fc99108d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jun  8 21:38:57 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* cont.c (root_fiber_alloc): set root fiber's status RUNNING.
+	  in cont_mark() only RUNNING fiber's machine stack is marked.
+	  root fiber's status should be RUNNING at the beginning regardless of
+	  FIBER_USE_NATIVE.
+
 Tue Jun  7 20:50:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* doc/irb/irb.rd: fix typo. patch by Nobuhiro IMAI.
diff --git a/cont.c b/cont.c
index 72e111797c..770cfeb1b4 100644
--- a/cont.c
+++ b/cont.c
@@ -1148,8 +1148,8 @@ root_fiber_alloc(rb_thread_t *th)
 #ifdef _WIN32
     fib->fib_handle = ConvertThreadToFiber(0);
 #endif
-    fib->status = RUNNING;
 #endif
+    fib->status = RUNNING;
     fib->prev_fiber = fib->next_fiber = fib;
 
     return fib;