diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
index 5b80d27cd3d3..9edbb0440d71 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
@@ -16,7 +16,10 @@
 package com.intellij.debugger.settings;
 
 import com.intellij.debugger.impl.DebuggerUtilsEx;
-import com.intellij.openapi.components.*;
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.components.State;
+import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.WriteExternalException;
@@ -36,7 +39,10 @@ import java.util.Map;
 @State(
   name = "DebuggerSettings",
   defaultStateAsResource = true,
-  storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml")
+  storages = {
+    @Storage(file = "debugger.xml"),
+    @Storage(file = "other.xml", deprecated = true)
+  }
 )
 public class DebuggerSettings implements Cloneable, PersistentStateComponent<Element> {
   private static final Logger LOG = Logger.getInstance(DebuggerSettings.class);
diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties
index c191528fee18..1a326f41ed5b 100644
--- a/platform/platform-resources-en/src/messages/OptionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties
@@ -328,6 +328,7 @@ exportable.FileTypeManager.presentable.name=File types
 exportable.EditorColorsManager.presentable.name=Color schemes
 exportable.ShortcutPromoterManager.presentable.name=Shortcut Promoter
 exportable.XDebuggerSettings.presentable.name=Debugger
+exportable.DebuggerSettings.presentable.name=Debugger: Java
 exportable.WebBrowsersConfiguration.presentable.name=Web Browsers
 exportable.TextDiffSettings.presentable.name=Text Diff
 exportable.PathMacrosImpl.presentable.name=Path Macros
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingManagerImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingManagerImpl.java
index 7ca13405558d..1ff9d01749d4 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingManagerImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingManagerImpl.java
@@ -15,7 +15,10 @@
  */
 package com.intellij.xdebugger.impl.settings;
 
-import com.intellij.openapi.components.*;
+import com.intellij.openapi.components.ComponentSerializationUtil;
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.State;
+import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.util.SmartList;
 import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters;
@@ -38,8 +41,8 @@ import java.util.*;
 @State(
   name = "XDebuggerSettings",
   storages = {
-    @Storage(file = StoragePathMacros.APP_CONFIG + "/debugger.xml"),
-    @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml", deprecated = true)
+    @Storage(file = "debugger.xml"),
+    @Storage(file = "other.xml", deprecated = true)
   }
 )
 public class XDebuggerSettingManagerImpl extends XDebuggerSettingsManager implements PersistentStateComponent<XDebuggerSettingManagerImpl.SettingsState> {