diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 85c4a6d71d..e59c9d5c08 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-16  Eli Zaretskii  <eliz@gnu.org>
+
+	* tui/tui-data.h (LINE_PREFIX): Make shorter
+	(MAX_PID_WIDTH): Enlarge from 14 to 19, to leave enough space for
+	"Thread NNNNN.XXXX" thread ID notation on Windows.
+
 2015-01-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix gcc-5 compilation.
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 81385b3975..8bfb4b312d 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -75,7 +75,7 @@ struct tui_gen_win_info
 
 /* Strings to display in the TUI status line.  */
 #define PROC_PREFIX             "In: "
-#define LINE_PREFIX             "Line: "
+#define LINE_PREFIX             "L"
 #define PC_PREFIX               "PC: "
 #define SINGLE_KEY              "(SingleKey)"
 
@@ -85,7 +85,7 @@ struct tui_gen_win_info
 				   numbers.  */
 #define MIN_PROC_WIDTH    12
 #define MAX_TARGET_WIDTH  10
-#define MAX_PID_WIDTH     14
+#define MAX_PID_WIDTH     19
 
 #define TUI_FLOAT_REGS_NAME                  "$FREGS"
 #define TUI_FLOAT_REGS_NAME_LOWER            "$fregs"