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 f8640a35acd1..b59a76b252c3 100644
--- a/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
@@ -62,7 +62,9 @@ public class ExternalResourceManagerExImpl extends ExternalResourceManagerEx imp
   @NonNls public static final String J2EE_1_2 = "http://java.sun.com/j2ee/dtds/";
   @NonNls public static final String J2EE_NS = "http://java.sun.com/xml/ns/j2ee/";
   @NonNls public static final String JAVAEE_NS = "http://java.sun.com/xml/ns/javaee/";
+
   private static final String CATALOG_PROPERTIES_ELEMENT = "CATALOG_PROPERTIES";
+  private static final String XSD_1_1 = new Resource("/standardSchemas/XMLSchema-1_1/XMLSchema.xsd", ExternalResourceManagerExImpl.class, null).getResourceUrl();
 
   private final Map<String, Map<String, String>> myResources = new THashMap<String, Map<String, String>>();
   private final Set<String> myResourceLocations = new THashSet<String>();
@@ -219,9 +221,9 @@ public class ExternalResourceManagerExImpl extends ExternalResourceManagerEx imp
     ExternalResourceManagerExImpl projectResources = getProjectResources(project);
     String location = projectResources.getResourceLocation(url, version);
     if (location == null || location.equals(url)) {
-      if (projectResources.myXMLSchemaVersion == XMLSchemaVersion.XMLSchema_1_1) { // substitute url
-        if (XmlUtil.XML_SCHEMA_URI.equals(url)) url = InternalResourceProvider.XML_SCHEMA_1_1;
-        if (InternalResourceProvider.XML_SCHEMA_URI_XSD.equals(url)) url = InternalResourceProvider.XML_SCHEMA_1_1_XSD;
+      if (projectResources.myXMLSchemaVersion == XMLSchemaVersion.XMLSchema_1_1) {
+        if (XmlUtil.XML_SCHEMA_URI.equals(url)) return XSD_1_1;
+        if ((XmlUtil.XML_SCHEMA_URI + ".xsd").equals(url)) return XSD_1_1;
       }
       return getResourceLocation(url, version);
     }
diff --git a/xml/xml-psi-impl/src/com/intellij/javaee/InternalResourceProvider.java b/xml/xml-psi-impl/src/com/intellij/javaee/InternalResourceProvider.java
index f2f07710c93d..f0e250f6c295 100644
--- a/xml/xml-psi-impl/src/com/intellij/javaee/InternalResourceProvider.java
+++ b/xml/xml-psi-impl/src/com/intellij/javaee/InternalResourceProvider.java
@@ -23,10 +23,6 @@ import com.intellij.xml.util.XmlUtil;
  */
 public class InternalResourceProvider implements StandardResourceProvider{
 
-  public static final String XML_SCHEMA_1_1 = XmlUtil.XML_SCHEMA_URI + "-1.1";
-  public static final String XML_SCHEMA_1_1_XSD = XML_SCHEMA_1_1 + ".xsd";
-  public static final String XML_SCHEMA_URI_XSD = XmlUtil.XML_SCHEMA_URI + ".xsd";
-
   @Override
   public void registerResources(ResourceRegistrar registrar) {
     ResourceRegistrarImpl impl = (ResourceRegistrarImpl)registrar;
@@ -36,10 +32,7 @@ public class InternalResourceProvider implements StandardResourceProvider{
     impl.addInternalResource(XmlUtil.XINCLUDE_URI,"xinclude.xsd");
 
     impl.addInternalResource(XmlUtil.XML_SCHEMA_URI, "XMLSchema.xsd");
-    impl.addInternalResource(XML_SCHEMA_URI_XSD, "XMLSchema.xsd");
-
-    //impl.addInternalResource(XML_SCHEMA_1_1, "1.1", "XMLSchema-1_1/XMLSchema.xsd");
-    //impl.addInternalResource(XML_SCHEMA_1_1_XSD, "1.1", "XMLSchema-1_1/XMLSchema.xsd");
+    impl.addInternalResource(XmlUtil.XML_SCHEMA_URI + ".xsd", "XMLSchema.xsd");
 
     impl.addInternalResource("http://www.w3.org/2001/XMLSchema.dtd", "XMLSchema.dtd");
     impl.addInternalResource(XmlUtil.XML_SCHEMA_INSTANCE_URI, "XMLSchema-instance.xsd");