diff --git a/ChangeLog b/ChangeLog
index e09c13c7c5..a7ab8057bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,41 +1,45 @@
+Thu May 17 17:35:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): address of local_vars might change during eval.
+
 Thu May 17 07:27:09 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/md5/md5.txt.jp, ext/sha1/sha1.txt.jp:
-	s/SuperClass/Superclass/.
+	  s/SuperClass/Superclass/.
 
 Thu May 17 07:21:44 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/Setup.dj, ext/Setup.emx, ext/Setup.nt, ext/Setup.x68:
-	compile sha1 in as well as md5.
+	  compile sha1 in as well as md5.
 
 	* ext/Setup: put sha1 in a comment.
 
 Thu May 17 07:16:38 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/sha1/sha1.txt.jp: add the Japanese version derived from
-	ext/md5/md5.txt.jp.
+	  ext/md5/md5.txt.jp.
 
 	* ext/sha1/sha1.txt: revise the copyright info and reduce the
-	difference from ext/md5/md5.txt.
+	  difference from ext/md5/md5.txt.
 
 	* ext/md5/md5.txt: reduce the difference from ext/sha1/sha1.txt.
 
 Thu May 17 07:11:35 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/sha1/extconf.rb, ext/sha1/sha1.c: use WORDS_BIGENDIAN to
-	detect the platform's endian.
+	  detect the platform's endian.
 
 Thu May 17 06:31:30 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/md5/md5.txt: make wording fixes, and mention the newly added
-	method: "<<".
+	  method: "<<".
 
 	* ext/md5/md5.txt.jp: ditto.
 
 Wed May 16 18:05:52 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/md5/md5init.c: add an instance method "<<" as an alias for
-	"update". (inspired by Steve Coltrin's ruby-sha1)
+	  "update". (inspired by Steve Coltrin's ruby-sha1)
 
 Tue May 15 17:46:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -43,6 +47,11 @@ Tue May 15 17:46:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_or): ditto.
 
+Tue May 15 02:18:23 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/thread.rb: rescue ThreadError in case the thread is dead
+	  just before calling Thread#run.
+
 Mon May 14 13:50:22 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_thread_schedule): should save context before raising
@@ -64,6 +73,11 @@ Sun May 13 23:51:14 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
 
 	* win32/resource.rb: Modify copyright in resource script.
 
+Sun May 13 14:03:33 2001  Okada Jun  <yun@be-in.org>
+
+	* lib/thread.rb: fix Queue#pop and SizedQueue#max= to avoid
+	  deadlock.
+
 Sat May 12 15:43:55 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
 
 	* win32/win32.c (kill): add support of signal 9 on mswin32/mingw32.
@@ -77,12 +91,12 @@ Fri May 11 15:09:52 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 Fri May 11 03:35:33 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* README.EXT: Document find_library(), with_config() and
-	dir_config().
+	  dir_config().
 
 Fri May 11 03:34:20 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* README.EXT.jp: Remove the description of find_header() because
-	such a function does not actually exist.
+	  such a function does not actually exist.
     
 	* README.EXT.jp: Update the description of dir_config().
 
diff --git a/eval.c b/eval.c
index 383f266e7d..6fa0cedec7 100644
--- a/eval.c
+++ b/eval.c
@@ -4435,11 +4435,15 @@ rb_call0(klass, recv, id, argc, argv, body, nosuper)
 			    }
 			    rb_eval(recv, opt);
 			}
+			local_vars = ruby_scope->local_vars;
 			if (node->nd_rest >= 0) {
+			    VALUE v;
+
 			    if (argc > 0)
-				local_vars[node->nd_rest]=rb_ary_new4(argc,argv);
+				v = rb_ary_new4(argc,argv);
 			    else
-				local_vars[node->nd_rest]=rb_ary_new2(0);
+				v = rb_ary_new2(0);
+			    ruby_scope->local_vars[node->nd_rest] = v;
 			}
 		    }
 		}
diff --git a/version.h b/version.h
index 9512376498..0560caaf5f 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.7.0"
-#define RUBY_RELEASE_DATE "2001-05-16"
+#define RUBY_RELEASE_DATE "2001-05-17"
 #define RUBY_VERSION_CODE 170
-#define RUBY_RELEASE_CODE 20010516
+#define RUBY_RELEASE_CODE 20010517