diff --git a/ChangeLog b/ChangeLog
index 2a67dd67..c9275bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar  5 22:00:36 CET 2011
+	Do not use POLLRDHUP, which causes build errors on OS X / OpenSolaris
+	(#1667). -CG
+
 Fri Mar  4 10:24:04 CET 2011
 	Added new API to allow MHD server to initiate connection to
 	client (special use-case for servers behind NAT), thereby
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 54b73f9b..77444409 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -650,7 +650,7 @@ MHD_handle_connection (void *data)
 
 	  fd = con->daemon->socket_fd;
 	  p[1].fd = fd;
-	  p[1].events |= POLLIN | POLLRDHUP;
+	  p[1].events |= POLLIN;
 	  
 	  if (poll (p, 
 		    (fd != -1) ? 2 : 1,