diff --git a/ChangeLog b/ChangeLog
index 5853d7badb..b920ed2931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+Sun Feb 13 23:12:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_start_0): restore prot_tag before rewinding.
+
 Sun Feb 13 16:56:52 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase 
+	* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
 	  to the value of status header field. ([ruby-dev:40617])
 
 Sun Feb 13 11:38:40 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
diff --git a/eval.c b/eval.c
index 662af12065..ad7465630d 100644
--- a/eval.c
+++ b/eval.c
@@ -11652,7 +11652,7 @@ rb_thread_start_0(fn, arg, th)
 	new_thread.proc = rb_block_proc();
 	new_thread.arg = (VALUE)arg;
 	th->anchor = ip;
-	longjmp(ip->tag->buf, TAG_THREAD);
+	longjmp((prot_tag = ip->tag)->buf, TAG_THREAD);
     }
 
     if (ruby_block) {		/* should nail down higher blocks */