diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a5399b125..46260fc94 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-12  Christopher Faylor  <cgf@redhat.com>
+
+	* pinfo.cc (_pinfo::commune_send): Fix bounds test so that poll of
+	communicating pid actually stops eventually.
+
 2003-07-10  Christopher Faylor  <cgf@redhat.com>
 
 	* path.cc (get_device_number): Remove special com?  consideration.
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 8899defb3..2e254303e 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -363,7 +363,7 @@ _pinfo::commune_send (DWORD code)
 
   /* FIXME: Need something better than an busy loop here */
   bool isalive;
-  for (int i = 0; (isalive = alive ()) || (i < 65536); i++)
+  for (int i = 0; (isalive = alive ()) && (i < 10000); i++)
     if (myself->hello_pid <= 0)
       break;
     else