diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index c4cb02e9a9..f24bf59c87 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -650,6 +650,9 @@ objfile_relocate (objfile, new_offsets)
       objfile->ei.main_func_lowpc  += ANOFFSET (delta, SECT_OFF_TEXT);
       objfile->ei.main_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
     }
+
+  /* Relocate breakpoints as necessary, after things are relocated. */
+  breakpoint_re_set ();
 }
 
 /* Many places in gdb want to test just to see if we have any partial
diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index 00deb6fb53..9fe9894bfe 100644
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -715,9 +715,6 @@ vx_add_symbols (name, from_tty, text_addr, data_addr, bss_addr)
   ANOFFSET (offs, SECT_OFF_DATA) = data_addr - ss.data_start;
   ANOFFSET (offs, SECT_OFF_BSS) = bss_addr - ss.bss_start;
   objfile_relocate (objfile, offs);
-
-  /* Need to do this *after* things are relocated.  */
-  breakpoint_re_set ();
 }
 
 /* This function allows the addition of incrementally linked object files.  */