diff --git a/ChangeLog.csl b/ChangeLog.csl
index a34a21d..2e8e67d 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,8 @@
+2006-06-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb/remote.c (remote_hostio_write): Correct buffer length
+	calculation.
+
 2006-06-01  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb/exec.c (exec_set_section_address): Always update the
diff --git a/gdb/remote.c b/gdb/remote.c
index 70fb27e..e9cfd97 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -6276,7 +6276,7 @@
   remote_buffer_add_string (&p, &left, ",");
 
   p += remote_escape_output (write_buf, len, p, &out_len,
-			     rs->remote_packet_size - strlen (p));
+			     rs->remote_packet_size - (p - rs->buf));
 
   return remote_hostio_send_command (p - rs->buf, PACKET_Fwrite,
 				     remote_errno, NULL, NULL);