diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
index ad71f8e1d50..87c5dad265c 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
@@ -269,6 +269,9 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
 		synchronized( getBreakpointMap() ) {
 			for ( int i = 0; i < breakpoints.length; ++i ) {
 				if ( breakpoints[i] instanceof ICBreakpoint ) {
+					try { // Remove any problem markers for this breakpoint
+						BreakpointProblems.removeProblemsForBreakpoint((ICBreakpoint)breakpoints[i]);
+					} catch (CoreException e) {}
 					Object obj = getBreakpointMap().get( (ICBreakpoint)breakpoints[i] );
 					ICDIBreakpoint b = null;
 					if ( obj instanceof ICDIBreakpoint ) {