diff --git a/ChangeLog b/ChangeLog
index 017e527f0c..5dc1c4578f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun  6 10:55:42 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_cont_call): forbid calling dead fiber with
+	  Cotinuation#call.
+
 Wed Jun  6 10:50:01 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* compile.c (iseq_compile_each): fix around yield arguments
diff --git a/cont.c b/cont.c
index 265e743a97..367d033757 100644
--- a/cont.c
+++ b/cont.c
@@ -344,6 +344,14 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
     if (cont->saved_thread.trap_tag != th->trap_tag) {
 	rb_raise(rb_eRuntimeError, "continuation called across trap");
     }
+    if (cont->saved_thread.fiber) {
+	rb_context_t *fcont;
+	GetContPtr(cont->saved_thread.fiber, fcont);
+
+	if (!fcont->alive) {
+	    rb_raise(rb_eRuntimeError, "continuation called dead fiber");
+	}
+    }
 
     cont->value = make_passing_arg(argc, argv);