diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 664eb8c4a3..7a3fdb2d1f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jan 19 02:13:40 2001  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	From 2000-10-27 Mark Salter <msalter@redhat.com>:
+	* remote.c (remote_remove_hw_breakpoint): Add 'len' field to Z
+ 	packet.
+	(remote_insert_hw_breakpoint): Ditto.
+
 2001-01-17  J.T. Conklin  <jtc@redback.com>
 
 	* config/m68k/tm-nbsd.h (USE_STRUCT_CONVENTION): Define.
diff --git a/gdb/remote.c b/gdb/remote.c
index fd3552a4d7..c990b1e37f 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -4431,7 +4431,7 @@ remote_insert_hw_breakpoint (CORE_ADDR addr, int len)
   
   addr = remote_address_masked (addr);
   p += hexnumstr (p, (ULONGEST) addr);
-  *p = '\0';
+  sprintf (p, ",%x", len);
 
   putpkt (buf);
   getpkt (buf, PBUFSIZ, 0);
@@ -4467,7 +4467,7 @@ remote_remove_hw_breakpoint (CORE_ADDR addr, int len)
   
   addr = remote_address_masked (addr);
   p += hexnumstr (p, (ULONGEST) addr);
-  *p = '\0';
+  sprintf (p, ",%x", len);
 
   putpkt(buf);
   getpkt (buf, PBUFSIZ, 0);