diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bb9de43bf..ce1539a78 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-23  Corinna Vinschen  <corinna@vinschen.de>
+
+	* miscfuncs.cc (check_iovec): Allow 0 as valid iovcnt value.
+
 2014-04-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* ldap.cc (user_attr): Remove "uid" attribute.
diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
index 20a2ef659..7397bea47 100644
--- a/winsup/cygwin/miscfuncs.cc
+++ b/winsup/cygwin/miscfuncs.cc
@@ -196,7 +196,7 @@ dummytest (volatile char *p)
 ssize_t
 check_iovec (const struct iovec *iov, int iovcnt, bool forwrite)
 {
-  if (iovcnt <= 0 || iovcnt > IOV_MAX)
+  if (iovcnt < 0 || iovcnt > IOV_MAX)
     {
       set_errno (EINVAL);
       return -1;
diff --git a/winsup/cygwin/release/1.7.30 b/winsup/cygwin/release/1.7.30
index c108180f7..08666bad3 100644
--- a/winsup/cygwin/release/1.7.30
+++ b/winsup/cygwin/release/1.7.30
@@ -19,3 +19,6 @@ Bug Fixes
 
 - Workaround a problem following native symlinks.
   Fixes: http://cygwin.com/ml/cygwin/2014-04/msg00384.html
+
+- Fix calls to readv/writev/recvmsg/sendmsg with 0 iovlen.
+  Fixes: http://cygwin.com/ml/cygwin/2014-04/msg00509.html