Index: src/server/gdb_server.c
===================================================================
--- src/server/gdb_server.c	(revision 959)
+++ src/server/gdb_server.c	(working copy)
@@ -2015,6 +2015,8 @@
 					break;
 				case 'R':
 					/* handle extended restart packet */
+					breakpoint_clear_target(gdb_service->target);
+					watchpoint_clear_target(gdb_service->target);
 					command_run_linef(connection->cmd_ctx, "ocd_gdb_restart %d", get_num_by_target(target));
 					break;
 				default: