diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 47b73508157..b4a400d3ce1 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-27 Mikhail Khodjaiants
+	Target filtering fixes for watchpoints.
+	* CBreakpointManager.java
+
 2004-09-21 Mikhail Khodjaiants
 	Fixed the problems with the Disassembly view and address breakpoints caused by switch to IAddress.
 	* CBreakpointManager.java
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 89d84a9b7f9..f0a096bad68 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
@@ -363,10 +363,10 @@ public class CBreakpointManager implements IBreakpointManagerListener, ICDIEvent
 	}
 
 	private void handleBreakpointCreatedEvent( final ICDIBreakpoint cdiBreakpoint ) {
-		if ( cdiBreakpoint instanceof ICDILocationBreakpoint )
-			doHandleLocationBreakpointCreatedEvent( (ICDILocationBreakpoint)cdiBreakpoint );
-		else if ( cdiBreakpoint instanceof ICDIWatchpoint )
+		if ( cdiBreakpoint instanceof ICDIWatchpoint )
 			doHandleWatchpointCreatedEvent( (ICDIWatchpoint)cdiBreakpoint );
+		else if ( cdiBreakpoint instanceof ICDILocationBreakpoint )
+			doHandleLocationBreakpointCreatedEvent( (ICDILocationBreakpoint)cdiBreakpoint );
 		if ( !cdiBreakpoint.isTemporary() && !DebugPlugin.getDefault().getBreakpointManager().isEnabled() ) {
 			try {
 				cdiBreakpoint.setEnabled( false );
@@ -406,6 +406,11 @@ public class CBreakpointManager implements IBreakpointManagerListener, ICDIEvent
 			}
 		}
 		if ( breakpoint != null ) {
+			try {
+				breakpoint.setTargetFilter( getDebugTarget() );
+			}
+			catch( CoreException e ) {
+			}
 			getBreakpointNotifier().breakpointInstalled( getDebugTarget(), breakpoint );
 		}
 	}