diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fe3d94572..4558c81fc 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-04  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_console.cc (set_console_title): Convert title string to
+	wchar_t and call SetConsoleTitleW.
+
 2009-06-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_console.cc (fhandler_console::read): Allow Ctrl-Space to
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index f3d26f40d..43f73597c 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -1892,12 +1892,11 @@ fhandler_console::set_close_on_exec (bool val)
 void __stdcall
 set_console_title (char *title)
 {
-  char buf[257];
-  strncpy (buf, title, sizeof (buf) - 1);
-  buf[sizeof (buf) - 1] = '\0';
+  wchar_t buf[257];
+  sys_mbstowcs (buf, sizeof buf, title);
   lock_ttys here (15000);
-  SetConsoleTitle (buf);
-  debug_printf ("title '%s'", buf);
+  SetConsoleTitleW (buf);
+  debug_printf ("title '%W'", buf);
 }
 
 void