diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 44a64673f2..6b490280f5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 29 15:17:16 1998  Keith Seitz  <keiths@onions.cygnus.com>
+
+	* tracepoint.c (trace_start_command): Set trace_running_p.
+	(trace_stop_command): Clear trace_running_p.
+
 Sat Mar 28 15:19:48 1998  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* NEWS: Update for 4.17 release.
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 42863538e3..e6bf60f825 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1576,6 +1576,7 @@ trace_start_command (args, from_tty)
       set_traceframe_num (-1);	/* all old traceframes invalidated */
       set_tracepoint_num (-1);
       set_traceframe_context(-1);
+      trace_running_p = 1;
     }
   else
     printf_filtered ("Trace can only be run on remote targets.\n");
@@ -1593,6 +1594,7 @@ trace_stop_command (args, from_tty)
       remote_get_noisy_reply (target_buf);
       if (strcmp (target_buf, "OK"))
 	error ("Bogus reply from target: %s", target_buf);
+      trace_running_p = 0;
     }
   else
     error ("Trace can only be run on remote targets.");