diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b26402df61..ddb8e78cbb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-31  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* tui/tui-data.c (tui_win_name): Make local variable const, remove
+	cast of NULL.
+
 2015-08-31  Max Filippov  <jcmvbkbc@gmail.com>
 
 	* xtensa-tdep.h (XTENSA_GDBARCH_TDEP_INSTANTIATE): Initialize
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 4623bf003c..b58425128d 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -402,7 +402,7 @@ tui_partial_win_by_name (char *name)
 const char *
 tui_win_name (const struct tui_gen_win_info *win_info)
 {
-  char *name = (char *) NULL;
+  const char *name = NULL;
 
   switch (win_info->type)
     {