diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 447714b0e3..fe88bf5510 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-09  Pedro Alves  <pedro@codesourcery.com>
+
+	* tracepoint.c (cmd_qtstatus): Report trace buffer circularity.
+
 2010-04-09  Stan Shebs  <stan@codesourcery.com>
 	    Pedro Alves  <pedro@codesourcery.com>
 
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 411f2b6273..df378ff4bb 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -1853,12 +1853,13 @@ cmd_qtstatus (char *packet)
       convert_int_to_ascii ((gdb_byte *) result_name, p, strlen (result_name));
     }
 
-  sprintf (packet, "T%c;%s:%x;tframes:%x;tcreated:%x;tfree:%x;tsize:%s",
-	   (tracing ? '1' : '0'),
+  sprintf (packet, "T%d;%s:%x;tframes:%x;tcreated:%x;tfree:%x;tsize:%s;circular:%d",
+	   tracing ? 1 : 0,
 	   stop_reason_rsp, tracing_stop_tpnum,
 	   traceframe_count, traceframes_created,
 	   free_space (),
-	   phex_nz (trace_buffer_hi - trace_buffer_lo, 0));
+	   phex_nz (trace_buffer_hi - trace_buffer_lo, 0),
+	   circular_trace_buffer);
 }
 
 /* State variables to help return all the tracepoint bits.  */