diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index cdfd7e032e5..deca1813bfb 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-23 Mikhail Khodjaiants
+	Fix for bug 58711: Breakpoint race condition.
+	Notify the Breakpoint Manager when the install count of breakpoint is changed.
+	* CBreakpointUpdater.java
+
 2004-04-21 Mikhail Khodjaiants
 	Implementing the Disassembly view. 
 	New annotation model is added to show breakpoint markers.
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java
index 86db4bac370..5e686fdfce2 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java
@@ -15,6 +15,7 @@ import org.eclipse.cdt.debug.core.ICBreakpointListener;
 import org.eclipse.cdt.debug.core.model.ICBreakpoint;
 import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
@@ -55,7 +56,8 @@ public class CBreakpointUpdater implements ICBreakpointListener {
 
 			public void run() {
 				try {
-					((ICBreakpoint)breakpoint).incrementInstallCount();
+					if ( ((ICBreakpoint)breakpoint).incrementInstallCount() == 1 )
+						DebugPlugin.getDefault().getBreakpointManager().fireBreakpointChanged( breakpoint );
 				}
 				catch( CoreException e ) {
 					CDebugUIPlugin.log( e.getStatus() );