diff --git a/ChangeLog b/ChangeLog
index 299a035fe4..520deabf71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 22 13:02:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
+
 Wed Sep 22 09:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y: remove global variables ruby_eval_tree and
diff --git a/win32/win32.c b/win32/win32.c
index 55c807c901..1363d78710 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3012,7 +3012,7 @@ rb_w32_call_handler(struct handler_arg_t* h)
 	rb_jump_tag(status);
     }
     h->finished = 1;
-    Sleep(INFINITE);		/* safe on Win95? */
+    yield_until(0);
 }
 
 static struct handler_arg_t *