diff --git a/ChangeLog b/ChangeLog
index 88f26801e2..f717b0d8ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 10 08:05:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_callcc): returned current thread instaed of
+	  continuation wrongly.
+
 Thu Aug 10 05:40:28 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
 	* ext/extmk.rb.in: $CPPFLAGS should be initialized.
diff --git a/eval.c b/eval.c
index cf61825a97..eb00963279 100644
--- a/eval.c
+++ b/eval.c
@@ -8105,7 +8105,7 @@ rb_callcc(self)
 	return th->result;
     }
     else {
-	return rb_yield(th->thread);
+	return rb_yield(cont);
     }
 }