diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties
index 866bff94d19e..d0876d581808 100644
--- a/platform/platform-resources-en/src/messages/OptionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties
@@ -344,4 +344,5 @@ exportable.ProjectManager.presentable.name=Default project
 exportable.com.intellij.ide.ui.customization.CustomActionsSchema.presentable.name=Menus and toolbars customization
 exportable.ActionMacroManager.presentable.name=Macros
 exportable.ImportFilteringUsageViewSetting.presentable.name=Usage View: Imports
-exportable.XPathView.XPathViewPlugin.presentable.name=XPath Viewer
\ No newline at end of file
+exportable.XPathView.XPathViewPlugin.presentable.name=XPath Viewer
+exportable.ExternalResourceManagerImpl.presentable.name=Java EE External Resources
\ No newline at end of file
diff --git a/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java b/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
index 7e16cdfe77b7..4d7e83b48b9a 100644
--- a/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,7 +53,10 @@ import java.util.*;
 
 @State(
   name = "ExternalResourceManagerImpl",
-  storages = {@Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml")}
+  storages = {
+    @Storage(file = "javaeeExternalResources.xml"),
+    @Storage(file = "other.xml", deprecated = true)
+  }
 )
 public class ExternalResourceManagerExImpl extends ExternalResourceManagerEx implements PersistentStateComponent<Element> {
   private static final Logger LOG = Logger.getInstance(ExternalResourceManagerExImpl.class);