diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 10717e399..091fa32a3 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-08  Corinna Vinschen  <corinna@vinschen.de>
+
+	* pinfo.cc (_pinfo::cwd): Initialize s to avoid comiler warning.
+	(_pinfo::cmdline): Ditto.
+
 2015-06-08  Corinna Vinschen  <corinna@vinschen.de>
 
 	* pinfo.cc (_pinfo::root): Fake default root for native processes.
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index f7fd9f00c..038937e15 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -892,7 +892,7 @@ open_commune_proc_parms (DWORD pid, PRTL_USER_PROCESS_PARAMETERS prupp)
 char *
 _pinfo::cwd (size_t& n)
 {
-  char *s;
+  char *s = NULL;
   if (!this || !pid)
     return NULL;
   if (ISSTATE (this, PID_NOTCYGWIN))
@@ -938,7 +938,7 @@ _pinfo::cwd (size_t& n)
 char *
 _pinfo::cmdline (size_t& n)
 {
-  char *s;
+  char *s = NULL;
   if (!this || !pid)
     return NULL;
   if (ISSTATE (this, PID_NOTCYGWIN))