diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f06e6324212..fd634e5f12f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-24  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* target-memory.c (claim_memory): Propagate baton for split memory
+	requests.
+
 2007-10-24  Pedro Alves  <pedro_alves@portugalmail.pt>
 
 	PR gdb/2341
diff --git a/gdb/target-memory.c b/gdb/target-memory.c
index 78f9d9c31cd..b0133677dde 100644
--- a/gdb/target-memory.c
+++ b/gdb/target-memory.c
@@ -84,10 +84,10 @@ claim_memory (VEC(memory_write_request_s) *blocks,
 	{
 	  struct memory_write_request *n =
 	    VEC_safe_push (memory_write_request_s, *result, NULL);
-	  memset (n, 0, sizeof (struct memory_write_request));
+	  *n = *r;
 	  n->begin = claimed_begin;
 	  n->end = claimed_end;
-	  n->data = r->data + (claimed_begin - r->begin);
+	  n->data += claimed_begin - r->begin;
 	}
     }
 }