diff --git a/ChangeLog b/ChangeLog
index c072148bb6..3031c5ccce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Feb 20 19:05:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_remove): thread may die in the process of
+	  rb_thread_die().  this change was suggested by Rudi Cilibrasi
+	  <cilibrar@drachma.ugcs.caltech.edu>.
+
+	* eval.c (rb_thread_start_0): main thread swapped by fork() may
+	  terminate rb_thread_start_0() successfully. call ruby_stop(0);
+	  this change too was suggested by Rudi.
+
 Thu Feb 20 18:44:51 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* file.c (file_expand_path): fix wrong behavior for root file.
diff --git a/eval.c b/eval.c
index 37923ecdea..4c5c0b55bf 100644
--- a/eval.c
+++ b/eval.c
@@ -7980,6 +7980,7 @@ rb_thread_remove(th)
 
     rb_thread_ready(th);
     rb_thread_die(th);
+    if (th->status == THREAD_KILLED) return; /* died in process */
     th->prev->next = th->next;
     th->next->prev = th->prev;
 }
@@ -9004,6 +9005,7 @@ rb_thread_start_0(fn, arg, th_arg)
 	}
     }
     rb_thread_schedule();
+    ruby_stop(0);		/* last thread termination */
     return 0;			/* not reached */
 }
 
diff --git a/parse.y b/parse.y
index b848fe71e7..ea581fa47d 100644
--- a/parse.y
+++ b/parse.y
@@ -3700,7 +3700,7 @@ yylex()
 	}
 	pushback(c);
 	if (ISDIGIT(c)) {
-	    rb_warn("no .<digit> floating literal anymore; put 0 before dot");
+	    rb_warning("no .<digit> floating literal anymore; put 0 before dot");
 	}
 	lex_state = EXPR_DOT;
 	return '.';