diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 61e2a5c5a..09fcdca00 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-30  Corinna Vinschen  <corinna@vinschen.de>
+
+	* net.cc (cygwin_sendto): Allow zero-sized packets.
+	(cygwin_sendmsg): Ditto.
+
 2006-06-26  Corinna Vinschen  <corinna@vinschen.de>
 
 	Revert patches from 2005-10-22 and 2006-06-14 to use event driven
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index b8213081f..5ec30f0e8 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -634,7 +634,7 @@ cygwin_sendto (int fd, const void *buf, int len, int flags,
   myfault efault;
   if (efault.faulted (EFAULT) || !fh)
     res = -1;
-  else if ((res = len) != 0)
+  else
     res = fh->sendto (buf, len, flags, to, tolen);
 
   syscall_printf ("%d = sendto (%d, %p, %d, %x, %p, %d)",
@@ -2295,8 +2295,7 @@ cygwin_sendmsg (int fd, const struct msghdr *msg, int flags)
   else
     {
       res = check_iovec_for_write (msg->msg_iov, msg->msg_iovlen);
-      if (res > 0)
-	res = fh->sendmsg (msg, flags, res); // res == iovec tot
+      res = fh->sendmsg (msg, flags, res); // res == iovec tot
     }
 
   syscall_printf ("%d = sendmsg (%d, %p, %x)", res, fd, msg, flags);