diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c3dfbf4ea..fdd452cd2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-22  Christopher Faylor  <cgf@timesys.com>
+
+	* pinfo.cc (winpids::add): Increment nelem when winpid is true since we
+	don't care if it's a cygwin process in that case.
+
 2005-12-22  Christopher Faylor  <cgf@timesys.com>
 
 	* pinfo.cc (winpids::release): Fix typo.
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 7851dda21..2cf848ebf 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -1214,8 +1214,9 @@ out:
 	      p.destroy = false;
 	    }
 	}
-      pidlist[nelem++] = pid;
     }
+  if (p || winpid)
+    pidlist[nelem++] = pid;
 }
 
 DWORD