diff --git a/ChangeLog b/ChangeLog
index f914a7a5..2eab80e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar 18 13:23:47 CET 2011
+	Removing MSG_DONTWAIT which should not be needed and was presumably
+	causing problems with EAGAIN under certain circumstances. -ES
+
 Fri Mar 11 22:25:29 CET 2011
 	Fixing bug in MHD_create_response_from_fd_at_offset with non-zero offsets. -ES
 
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 3dce3942..e050d585 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -75,9 +75,6 @@
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif
-#ifndef MSG_DONTWAIT
-#define MSG_DONTWAIT 0
-#endif
 #endif
 
 /**
@@ -712,7 +709,7 @@ recv_param_adapter (struct MHD_Connection *connection,
     return -1;
   if (0 != (connection->daemon->options & MHD_USE_SSL))
     return RECV (connection->socket_fd, other, i, MSG_NOSIGNAL);
-  return RECV (connection->socket_fd, other, i, MSG_NOSIGNAL | MSG_DONTWAIT);
+  return RECV (connection->socket_fd, other, i, MSG_NOSIGNAL);
 }
 
 /**
@@ -767,7 +764,7 @@ send_param_adapter (struct MHD_Connection *connection,
 	 http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html */
     }
 #endif
-  return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL | MSG_DONTWAIT);
+  return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL);
 }