diff --git a/ChangeLog b/ChangeLog
index 68631d098a..eb839ae344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 29 10:55:24 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c: fix bug around Continuation and Fiber.
+
+	* test/ruby/test_continuation.rb: add tests for Continuation.
+
 Tue May 29 10:54:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_opendir, rb_w32_readdir): eliminate magic
diff --git a/cont.c b/cont.c
index 4f228f03bf..786f00835b 100644
--- a/cont.c
+++ b/cont.c
@@ -53,7 +53,7 @@ cont_mark(void *ptr)
 	    rb_gc_mark_locations(cont->vm_stack,
 				 cont->vm_stack + cont->saved_thread.stack_size);
 	}
-	
+
 	if (cont->machine_stack) {
 	    rb_gc_mark_locations(cont->machine_stack,
 				 cont->machine_stack + cont->machine_stack_size);
@@ -128,6 +128,7 @@ cont_capture(volatile int *stat)
 
     cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
     MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
+    th->stack = 0;
 
     cont_save_machine_stack(th, cont);
 
@@ -157,10 +158,12 @@ cont_restore_1(rb_context_t *cont)
 	/* fiber */
 	th->stack = sth->stack;
 	th->stack_size = sth->stack_size;
+	th->fiber = cont->self;
     }
     else {
 	/* continuation */
 	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
+	th->fiber = sth->fiber;
     }
 
     th->cfp = sth->cfp;
@@ -169,11 +172,10 @@ cont_restore_1(rb_context_t *cont)
     th->state = sth->state;
     th->status = sth->status;
     th->tag = sth->tag;
+    th->trap_tag = sth->trap_tag;
     th->errinfo = sth->errinfo;
     th->first_proc = sth->first_proc;
 
-    th->fiber = cont->self;
-
     /* restore machine stack */
     if (cont->machine_stack_src) {
 	MEMCPY(cont->machine_stack_src, cont->machine_stack,
diff --git a/test/ruby/test_continuation.rb b/test/ruby/test_continuation.rb
new file mode 100644
index 0000000000..d5c9c32e4b
--- /dev/null
+++ b/test/ruby/test_continuation.rb
@@ -0,0 +1,31 @@
+require 'test/unit'
+
+class TestContinuation < Test::Unit::TestCase
+  def test_create
+    assert_equal(:ok, callcc{:ok})
+    assert_equal(:ok, callcc{|c| c.call :ok})
+  end
+
+  def test_call
+    assert_equal(:ok, callcc{|c| c.call :ok})
+
+    ary = []
+    ary << callcc{|c|
+      @cont = c
+      :a
+    }
+    @cont.call :b if ary.length < 3
+    assert_equal([:a, :b, :b], ary)
+  end
+
+  def test_error
+    cont = callcc{|c| c}
+    assert_raise(RuntimeError){
+      Thread.new{cont.call}.join
+    }
+    assert_raise(LocalJumpError){
+      callcc
+    }
+  end
+end
+