diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 559f99efe..acf5e90f9 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-22  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_tty.cc (fhandler_pty_master::setup): Fix crash in debug
+	output.
+
 2011-06-18  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.cc (normalize_win32_path): Skip all slashes after recognizing
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index f285dba1b..a03fddbdc 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1676,7 +1676,8 @@ err:
   close_maybe (from_master);
   close_maybe (to_master);
   close_maybe (master_ctl);
-  termios_printf ("tty%d open failed - failed to create %s", errstr);
+  termios_printf ("tty%d open failed - failed to create %s", t.get_unit (),
+		  errstr);
   return false;
 }