diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4af147e78..4d2806e97 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-28  Corinna Vinschen  <corinna@vinschen.de>
+
+	* poll.cc (poll): Eliminate erroneous POLLERR conditional.
+
 2002-08-26  Conrad Scott  <conrad.scott@dsl.pipex.com>
 
 	* fhandler_socket.cc (fhandler_socket::check_peer_secret_event):
diff --git a/winsup/cygwin/poll.cc b/winsup/cygwin/poll.cc
index a1c50e8b0..89a3124d1 100644
--- a/winsup/cygwin/poll.cc
+++ b/winsup/cygwin/poll.cc
@@ -88,8 +88,6 @@ poll (struct pollfd *fds, unsigned int nfds, int timeout)
 		  fds[i].revents |= POLLIN;
 		if (FD_ISSET(fds[i].fd, write_fds))
 		  fds[i].revents |= POLLOUT;
-		if (FD_ISSET(fds[i].fd, read_fds) && FD_ISSET(fds[i].fd, write_fds))
-		  fds[i].revents |= POLLERR;
 		if (FD_ISSET(fds[i].fd, except_fds))
 		  fds[i].revents |= POLLPRI;
 	      }