diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 40923fc45..659649cf0 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-14  Christopher Faylor  <cgf@redhat.com>
+
+	* pinfo.cc (pinfo::init): Properly handle execed process stub when
+	PID_NOREDIR is specified.
+
 2002-03-13  Boris Schaeling  <boriss@web.de>
 
 	* poll.cc (poll): Remove variable open_fds.  Rearrange and add code to
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 1bc4ac411..8e497ef18 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -183,6 +183,11 @@ pinfo::init (pid_t n, DWORD flag, HANDLE in_h)
 	    api_fatal ("retrieval of execed process info for pid %d failed due to recursion.", n);
 	  n = realpid;
 	  release ();
+	  if (flag & PID_NOREDIR)
+	    {
+	      set_errno (ENOENT);
+	      break;
+	    }
 	  continue;
 	}