diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 738d757b1f..a71cc5ce9b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-19  Pedro Alves  <palves@redhat.com>
+
+	* breakpoint.c (remove_threaded_breakpoints): Skip non-user
+	breakpoints.
+
 2013-09-19  Pedro Alves  <palves@redhat.com>
 	    Thomas Schwinge  <thomas@codesourcery.com>
 	    Yue Lu  <hacklu.newborn@gmail.com>
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 734dfd6c11..c132e24aa6 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2938,7 +2938,7 @@ remove_threaded_breakpoints (struct thread_info *tp, int silent)
 
   ALL_BREAKPOINTS_SAFE (b, b_tmp)
     {
-      if (b->thread == tp->num)
+      if (b->thread == tp->num && user_breakpoint_p (b))
 	{
 	  b->disposition = disp_del_at_next_stop;