diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fd4531055..3073042fb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 23 16:43:33 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* sigproc.cc (proc_subproc): Don't send a false positive if WNOHANG and
+	no processes are available for waiting.
+
 Mon Oct 23 22:27:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
 	* fhandler.cc (fhandler_base::fcntl): Setting flags in F_SETFL
diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index 50669556a..1d235b635 100644
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -358,7 +358,7 @@ proc_subproc (DWORD what, DWORD val)
 	      w->next->pid = 0;
 	      if (clearing)
 		w->next->status = -1;		/* flag that a signal was received */
-	      else if (!(w->next->options & WNOHANG))
+	      else if (!potential_match || !(w->next->options & WNOHANG))
 		w->next->ev = NULL;
 	      if (!SetEvent (oldw))
 		system_printf ("couldn't wake up wait event %p, %E", oldw);