diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 49cc67e79..51788c2bc 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-25  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_console.cc (set_console_title): Set buffer size to
+	TITLESIZE + 1.  Call sys_mbstowcs with correct destination length.
+
 2009-07-24  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* sigproc.h (wait_for_sigthread): Eliminate parameter.
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 5cc7e332f..1d166efb0 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -1892,8 +1892,8 @@ fhandler_console::set_close_on_exec (bool val)
 void __stdcall
 set_console_title (char *title)
 {
-  wchar_t buf[257];
-  sys_mbstowcs (buf, sizeof buf, title);
+  wchar_t buf[TITLESIZE + 1];
+  sys_mbstowcs (buf, TITLESIZE + 1, title);
   lock_ttys here (15000);
   SetConsoleTitleW (buf);
   debug_printf ("title '%W'", buf);