diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
index 53130591a07..c6e068246ee 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
@@ -745,6 +745,8 @@ public class CModelManager implements IResourceChangeListener {
 	 */
 	public void shutdown() {
 		// Do any shutdown of services.
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(factory);	
+
 		BinaryRunner[] runners = (BinaryRunner[])binaryRunners.values().toArray(new BinaryRunner[0]);
 		for (int i = 0; i < runners.length; i++) {
 			if (runners[i].isAlive()) {