diff --git a/ChangeLog b/ChangeLog
index 7c28490ca8..3e3451afe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
-Mon Apr  2 13:54:21 2001  Shugo Maeda <shugo@ruby-lang.org>
+Mon Apr  2 14:25:49 2001  Shugo Maeda <shugo@ruby-lang.org>
 
 	* lib/monitor.rb (wait): ensure reentrance.
 
+	* lib/monitor.rb (wait): fix timeout support.
+
 Mon Apr  2 12:40:45 2001  Shugo Maeda <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (media_subtype): return subtype.
diff --git a/lib/monitor.rb b/lib/monitor.rb
index d36546ab6d..721c51a9f5 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -69,6 +69,15 @@ module MonitorMixin
 	raise ThreadError, "current thread not owner"
       end
       
+      if timeout
+	ct = Thread.current
+	timeout_thread = Thread.start {
+	  Thread.pass
+	  sleep(timeout)
+	  ct.raise(Timeout.new)
+	}
+      end
+
       Thread.critical = true
       count = @monitor.mon_count
       @monitor.mon_count = 0
@@ -80,23 +89,18 @@ module MonitorMixin
       end
       t.wakeup if t
       @waiters.push(Thread.current)
-      
-      if timeout
-	t = Thread.current
-	timeout_thread = Thread.start {
-	  sleep(timeout)
-	  t.raise(Timeout.new)
-	}
-      end
+
       begin
 	Thread.stop
       rescue Timeout
-	@waiters.delete(Thread.current)
       ensure
 	Thread.critical = true
 	if timeout && timeout_thread.alive?
 	  Thread.kill(timeout_thread)
 	end
+	if @waiters.include?(Thread.current)  # interrupted?
+	  @waiters.delete(Thread.current)
+	end
 	while @monitor.mon_owner &&
 	    @monitor.mon_owner != Thread.current
 	  @monitor.mon_waiting_queue.push(Thread.current)