diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java
index 0a50103fbf6b..85c07f5fcaee 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java
@@ -375,7 +375,9 @@ public class FetchExtResourceAction extends BaseExtResourceAction implements Wat
                 candidateName = e.getText().substring(1,e.getTextLength()-1);
               } else if (e instanceof XmlToken &&
                          candidateName != null &&
-                         ((XmlToken)e).getTokenType() == XmlTokenType.XML_DOCTYPE_PUBLIC
+                         ( ((XmlToken)e).getTokenType() == XmlTokenType.XML_DOCTYPE_PUBLIC ||
+                           ((XmlToken)e).getTokenType() == XmlTokenType.XML_DOCTYPE_SYSTEM
+                         )
                          ) {
                 if (!result.contains(candidateName)) {
                   result.add(candidateName);
diff --git a/xml/impl/src/com/intellij/xml/XmlFileTypeFactory.java b/xml/impl/src/com/intellij/xml/XmlFileTypeFactory.java
index 12e341c87c0c..6957397a85b8 100644
--- a/xml/impl/src/com/intellij/xml/XmlFileTypeFactory.java
+++ b/xml/impl/src/com/intellij/xml/XmlFileTypeFactory.java
@@ -32,7 +32,7 @@ public class XmlFileTypeFactory extends FileTypeFactory {
   public void createFileTypes(@NotNull final FileTypeConsumer consumer) {
     consumer.consume(HtmlFileType.INSTANCE, "html;htm;sht;shtm;shtml");
     consumer.consume(XHtmlFileType.INSTANCE, "xhtml");
-    consumer.consume(DTDFileType.INSTANCE, "dtd;ent;mod");
+    consumer.consume(DTDFileType.INSTANCE, "dtd;ent;mod;elt");
 
     consumer.consume(XmlFileType.INSTANCE, "xml;xsd;tld;xsl;jnlp;wsdl;hs;jhm;ant;xul;xslt;rng");
     TypedHandler.registerBaseLanguageQuoteHandler(XMLLanguage.class, TypedHandler.getQuoteHandlerForType(XmlFileType.INSTANCE));