diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index df9d4612e5..45bf2b4573 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar  3 17:18:57 1996  James G. Smith  <jsmith@cygnus.co.uk>
+
+	* remote-mips.c (common_breakpoint): Explicitly terminate the
+ 	returned buffer.
+
 Wed Feb 28 22:32:18 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	From Wilfried Moser <wilfried.moser@aut.alcatel.at>:
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 27bcf866a9..81160b4430 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -2297,6 +2297,7 @@ common_breakpoint (cmd, addr, mask, flags)
   mips_send_packet (buf, 1);
 
   len = mips_receive_packet (buf, 1, mips_receive_wait);
+  buf[len] = '\0';
 
   nfields = sscanf (buf, "0x%x %c 0x%x 0x%x", &rpid, &rcmd, &rerrflg, &rresponse);
 
@@ -2683,7 +2684,7 @@ pmon_check_ack()
 {
   int c = SERIAL_READCHAR (mips_desc, 2);
   if ((c == SERIAL_TIMEOUT) || (c != 0x06)) {
-    fprintf_unfiltered (gdb_stderr, "Failed to received valid ACK\n");
+    fprintf_unfiltered (gdb_stderr, "Failed to receive valid ACK\n");
     return(-1); /* terminate the download */
   }
   return(0);