diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a003cf0b0..2ded7a67e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-19  Jon TURNEY  <jon.turney@dronecode.org.uk>
+
+	* cygserver_ipc.h (ipc_retval::ipc_retval): Take ssize_t as argument
+	to make sure entire ipc_retval union is initialized on all supported
+	platforms.
+
 2013-07-18  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.cc (normalize_posix_path): Start checking path before ".." at
diff --git a/winsup/cygwin/cygserver_ipc.h b/winsup/cygwin/cygserver_ipc.h
index 260415044..4ed3cdf51 100644
--- a/winsup/cygwin/cygserver_ipc.h
+++ b/winsup/cygwin/cygserver_ipc.h
@@ -59,7 +59,7 @@ private:
   };
 
 public:
-  ipc_retval (int ni) { i = ni; }
+  ipc_retval (ssize_t nssz) { ssz = nssz; }
 
   operator int () const { return i; }
   int operator = (int ni) { return i = ni; }