diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d550938ae9..e15e9f2eea 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-07  Maciej W. Rozycki  <macro@imgtec.com>
+
+	PR breakpoints/21886
+	* mem-break.c (default_memory_insert_breakpoint): Use
+	`->placed_address' rather than `->reqstd_address' for the
+	breakpoint location.
+
 2017-08-07  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* arch-utils.c (default_print_insn): Remove arch/mach/endian
diff --git a/gdb/mem-break.c b/gdb/mem-break.c
index f87eea4683..e35d0a5071 100644
--- a/gdb/mem-break.c
+++ b/gdb/mem-break.c
@@ -37,7 +37,7 @@ int
 default_memory_insert_breakpoint (struct gdbarch *gdbarch,
 				  struct bp_target_info *bp_tgt)
 {
-  CORE_ADDR addr = bp_tgt->reqstd_address;
+  CORE_ADDR addr = bp_tgt->placed_address;
   const unsigned char *bp;
   gdb_byte *readbuf;
   int bplen;