diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 1572bcb21d0..c41ca3814a6 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-20  Pedro Alves  <palves@redhat.com>
+
+	* tracepoint.c (cmd_qtstatus): Make "str" const.
+
 2015-03-20  Pedro Alves  <palves@redhat.com>
 
 	* server.c (handle_general_set): Make "req_str" const.
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 42b27c072e0..3ce958066f7 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -3615,7 +3615,8 @@ static void
 cmd_qtstatus (char *packet)
 {
   char *stop_reason_rsp = NULL;
-  char *buf1, *buf2, *buf3, *str;
+  char *buf1, *buf2, *buf3;
+  const char *str;
   int slen;
 
   /* Translate the plain text of the notes back into hex for