diff --git a/ChangeLog b/ChangeLog
index 376d7d305a..dc52f35109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 21 15:08:53 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (do_spawn, do_aspawn): should wait child process even
+	  if callded with P_OVERLAY.
+
 Tue Oct 21 00:35:02 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/soap/calc/*, test/soap/helloworld/*: catch the exception from
diff --git a/win32/win32.c b/win32/win32.c
index 0e75f431a1..cbcecb6f8e 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -758,6 +758,7 @@ char *cmd;
       case P_NOWAIT:
 	return child->pid;
       case P_OVERLAY:
+	WaitForSingleObject(child->hProcess, INFINITE);
 	exit(0);
       default:
 	return -1;	/* not reached */
@@ -848,6 +849,7 @@ char **argv;
       case P_NOWAIT:
 	return child->pid;
       case P_OVERLAY:
+	WaitForSingleObject(child->hProcess, INFINITE);
 	exit(0);
       default:
 	return -1;	/* not reached */