diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 73283449e85..522c3f8dbfc 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-20 Mikhail Khodjaiants
+	CModuleManager needs to extend PlatformObject to be accessible as an adapter 
+	for IModuleRetrival.
+	* CModuleManager.java
+
 2006-02-08 Mikhail Khodjaiants
 	Bug 126958: wrong state setting for thread in CThread.handleResumeEvent().
 	* CThread.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModuleManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModuleManager.java
index 89576f32fe0..355835d248e 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModuleManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModuleManager.java
@@ -21,6 +21,7 @@ import org.eclipse.cdt.debug.core.model.IModuleRetrieval;
 import org.eclipse.cdt.debug.internal.core.ICDebugInternalConstants;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.PlatformObject;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.DebugException;
@@ -28,7 +29,7 @@ import org.eclipse.debug.core.DebugException;
 /**
  * Manages the modules loaded on this debug target.
  */
-public class CModuleManager implements IModuleRetrieval {
+public class CModuleManager extends PlatformObject implements IModuleRetrieval {
 
 	/**
 	 * The debug target associated with this manager.