diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 77300ede9..52a10ada7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-06  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* include/limits.h (TTY_NAME_MAX): Increase size to same as linux to
+	allow for (at least) null terminating byte for "/dev/console".
+
 2008-01-01  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* tty.cc: Update copyright.
diff --git a/winsup/cygwin/include/limits.h b/winsup/cygwin/include/limits.h
index 6dcf9caa1..7d829db72 100644
--- a/winsup/cygwin/include/limits.h
+++ b/winsup/cygwin/include/limits.h
@@ -289,7 +289,7 @@ details. */
 
 /* Maximum number of characters in a tty name. */
 #undef TTY_NAME_MAX
-#define TTY_NAME_MAX 12
+#define TTY_NAME_MAX 32
 
 /* Maximum number of bytes supported for the name of a timezone (not of the TZ variable).  Not implemented. */
 #undef TZNAME_MAX