diff --git a/platform/platform-resources/src/META-INF/xdebugger.xml b/platform/platform-resources/src/META-INF/xdebugger.xml
index aaf009193324..9653aa92091e 100644
--- a/platform/platform-resources/src/META-INF/xdebugger.xml
+++ b/platform/platform-resources/src/META-INF/xdebugger.xml
@@ -1,4 +1,11 @@
 <root>
+  <project-components>
+    <component>
+      <interface-class>com.intellij.xdebugger.XDebuggerManager</interface-class>
+      <implementation-class>com.intellij.xdebugger.impl.XDebuggerManagerImpl</implementation-class>
+    </component>
+  </project-components>
+
   <extensionPoints>
     <extensionPoint name="xdebugger.settings" interface="com.intellij.xdebugger.settings.XDebuggerSettings"/>
     <extensionPoint name="xdebugger.breakpointType" interface="com.intellij.xdebugger.breakpoints.XBreakpointType"/>
@@ -14,9 +21,6 @@
     <applicationService serviceInterface="com.intellij.xdebugger.XDebuggerUtil"
                         serviceImplementation="com.intellij.xdebugger.impl.XDebuggerUtilImpl"/>
 
-    <projectService serviceInterface="com.intellij.xdebugger.XDebuggerManager"
-                    serviceImplementation="com.intellij.xdebugger.impl.XDebuggerManagerImpl"/>
-
     <projectService serviceImplementation="com.intellij.xdebugger.impl.evaluate.quick.common.ValueLookupManager"/>
 
     <projectService serviceInterface="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsConfigurationDialogFactory"
diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java
index 4d9f7ea5c909..bb9e8432e9e0 100644
--- a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java
+++ b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java
@@ -35,7 +35,7 @@ import java.util.Collection;
 public abstract class XDebuggerManager {
 
   public static XDebuggerManager getInstance(@NotNull Project project) {
-    return ServiceManager.getService(project, XDebuggerManager.class);
+    return project.getComponent(XDebuggerManager.class);
   }
 
   @NotNull
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java
index ab5d849c36c0..08e80cc97d3a 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java
@@ -27,6 +27,7 @@ import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.execution.ui.RunContentManagerImpl;
 import com.intellij.execution.ui.RunContentWithExecutorListener;
 import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -59,7 +60,7 @@ import java.util.*;
     storages = {@Storage(
         id = "other",
         file = "$WORKSPACE_FILE$")})
-public class XDebuggerManagerImpl extends XDebuggerManager implements PersistentStateComponent<XDebuggerManagerImpl.XDebuggerState> {
+public class XDebuggerManagerImpl extends XDebuggerManager implements ProjectComponent, PersistentStateComponent<XDebuggerManagerImpl.XDebuggerState> {
   @NonNls public static final String COMPONENT_NAME = "XDebuggerManager";
   private final Project myProject;
   private final XBreakpointManagerImpl myBreakpointManager;
@@ -112,6 +113,28 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements Persistent
     return myProject;
   }
 
+  @Override
+  public void projectOpened() {
+  }
+
+  @Override
+  public void projectClosed() {
+  }
+
+  @NotNull
+  @Override
+  public String getComponentName() {
+    return COMPONENT_NAME;
+  }
+
+  @Override
+  public void initComponent() {
+  }
+
+  @Override
+  public void disposeComponent() {
+  }
+
   @NotNull
   public XDebugSession startSession(@NotNull final ProgramRunner runner,
                                     @NotNull final ExecutionEnvironment env,