diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index de4a29412a4..b5e11907423 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-10 Mikhail Khodjaiants
+	Disable the address breakpoints to prevent the debugger to insert them prematurely.
+	* CDebugTarget.java
+
 2003-02-05 David Inglis
 
 	Refactor Constants to debug.core
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index b2e0a38b8f5..3b67ffb7557 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -345,6 +345,17 @@ public class CDebugTarget extends CDebugElement
 			{
 				if ( bps[i] instanceof ICBreakpoint && isTargetBreakpoint( bps[i] ) && findCDIBreakpoint( bps[i] ) == null ) 
 				{
+					if ( bps[i] instanceof ICAddressBreakpoint )
+					{
+						// disable address breakpoints to prevent the debugger to insert them prematurely 
+						try
+						{
+							bps[i].setEnabled( false );
+						}
+						catch( CoreException e )
+						{
+						}
+					}
 					breakpointAdded( (ICBreakpoint)bps[i] );
 				}
 			}
@@ -352,6 +363,10 @@ public class CDebugTarget extends CDebugElement
 		}
 	}
 
+	private void disableAddressBreakpoints()
+	{
+		
+	}
 	private boolean isTargetBreakpoint( IBreakpoint bp )
 	{
 		IProject project = bp.getMarker().getResource().getProject();