diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 36eb08975..2d2435659 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_console.cc (create_invisible_console_workaround):  Fix
+	size of cmd to take spaces into account.
+
 2009-08-08  Corinna Vinschen  <corinna@vinschen.de>
 
 	* dtable.cc (dtable::init_std_file_from_handle): Fix comment to
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 1d166efb0..bbb248b6a 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -2008,7 +2008,7 @@ fhandler_console::create_invisible_console_workaround ()
 	  STARTUPINFOW si = {};
 	  PROCESS_INFORMATION pi;
 	  size_t len = helper.get_wide_win32_path_len ();
-	  WCHAR cmd[len + (2 * strlen ("0xffffffff")) + 1];
+	  WCHAR cmd[len + (2 * strlen ("0xffffffff")) + 2 /* spaces */ + 1];
 	  WCHAR title[] = L"invisible cygwin console";
 
 	  helper.get_wide_win32_path (cmd);