diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2c146ab96..b70737541 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-07  Christopher Faylor  <cgf@redhat.com>
+
+	* poll.cc: Define FD_SETSIZE to ridiculously large number so that there
+	will be no artificially large limits.
+
 2003-06-07  Christopher Faylor  <cgf@redhat.com>
 
 	* fhandler_tty.cc (fhandler_tty_slave::close): Free the console when
diff --git a/winsup/cygwin/poll.cc b/winsup/cygwin/poll.cc
index e12ed969d..44d00b9a5 100644
--- a/winsup/cygwin/poll.cc
+++ b/winsup/cygwin/poll.cc
@@ -10,6 +10,7 @@
 
 #define  __INSIDE_CYGWIN_NET__
 
+#define FD_SETSIZE 16384		// lots of fds
 #include "winsup.h"
 #include <sys/time.h>
 #include <sys/poll.h>