diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4ffa4e7041d..47d28e3747e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-07  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* progspace.c (clone_program_space): Pass SYMFILE_DEFER_BP_RESET
+	to symbol_file_add_main.
+
 2018-04-07  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	PR mi/22299
diff --git a/gdb/progspace.c b/gdb/progspace.c
index e0bcc5a18d6..ba400d47aa5 100644
--- a/gdb/progspace.c
+++ b/gdb/progspace.c
@@ -166,7 +166,8 @@ clone_program_space (struct program_space *dest, struct program_space *src)
     exec_file_attach (src->pspace_exec_filename, 0);
 
   if (src->symfile_object_file != NULL)
-    symbol_file_add_main (objfile_name (src->symfile_object_file), 0);
+    symbol_file_add_main (objfile_name (src->symfile_object_file),
+			  SYMFILE_DEFER_BP_RESET);
 
   return dest;
 }