diff --git a/ChangeLog b/ChangeLog
index 4dd9233811..79761e3233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr  9 23:22:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (mark_current_machine_context): Call SET_STACK_END.
+	  This reverts a hunk of r40703 by ko1.
+	  This fixes [ruby-dev:48098] [Bug #9717].
+
 Wed Apr  9 21:02:04 2014  Tanaka Akira  <akr@fsij.org>
 
 	* process.c (OBJ2UID1): Defined even if getpwnam_r is not usable.
diff --git a/gc.c b/gc.c
index 18043c2a13..d8e55cde3e 100644
--- a/gc.c
+++ b/gc.c
@@ -3507,6 +3507,7 @@ mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
     /* This assumes that all registers are saved into the jmp_buf (and stack) */
     rb_setjmp(save_regs_gc_mark.j);
 
+    SET_STACK_END;
     GET_STACK_BOUNDS(stack_start, stack_end, 1);
 
     mark_locations_array(objspace, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v));