diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java
index bf00acdedd3..0343c6a426d 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java
@@ -126,6 +126,7 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
 					if (resource.getType() == IResource.PROJECT) {
 						//TODO: better handlind of resource remove/rename
 						fDiscoveredInfoHolderMap.remove(resource);
+						ScannerConfigProfileManager.getInstance().handleProjectRemoved(resource.getProject());
 					}
 					break;
 			}
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java
index ac2ff6f1754..9778ccbe5fc 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -94,6 +94,10 @@ public class ScannerConfigProfileManager {
 		return map;
 	}
 	
+	public void handleProjectRemoved(IProject project){
+		projectToProfileInstanceMap.remove(project);
+	}
+	
 	/**
 	 * @param project
 	 * @param profileId - if null, get the one associated with the project