diff --git a/java/java-tests/java-tests.iml b/java/java-tests/java-tests.iml
index ef3e588c0480..cc0afca03321 100644
--- a/java/java-tests/java-tests.iml
+++ b/java/java-tests/java-tests.iml
@@ -30,7 +30,6 @@
     <orderEntry type="module" module-name="java-indexing-api" scope="TEST" />
     <orderEntry type="module" module-name="external-system-impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="junit_rt" scope="TEST" />
-    <orderEntry type="module" module-name="manifest" scope="TEST" />
   </component>
 </module>
 
diff --git a/java/manifest/src/META-INF/ManifestSupport.xml b/java/manifest/src/META-INF/ManifestSupport.xml
new file mode 100644
index 000000000000..d0351b3ba04a
--- /dev/null
+++ b/java/manifest/src/META-INF/ManifestSupport.xml
@@ -0,0 +1,22 @@
+<idea-plugin>
+  <extensionPoints>
+    <extensionPoint name="manifest.parser.provider" interface="org.jetbrains.lang.manifest.header.HeaderParserProvider"/>
+  </extensionPoints>
+  <extensions defaultExtensionNs="com.intellij">
+    <fileTypeFactory implementation="org.jetbrains.lang.manifest.ManifestFileTypeFactory"/>
+    <lang.parserDefinition language="Manifest" implementationClass="org.jetbrains.lang.manifest.parser.ManifestParserDefinition"/>
+    <lang.syntaxHighlighterFactory key="Manifest" implementationClass="org.jetbrains.lang.manifest.highlighting.ManifestSyntaxHighlighterFactory"/>
+    <annotator language="Manifest" implementationClass="org.jetbrains.lang.manifest.highlighting.HeaderAnnotator"/>
+    <lang.elementManipulator forClass="org.jetbrains.lang.manifest.psi.HeaderValuePart"
+                             implementationClass="org.jetbrains.lang.manifest.psi.impl.HeaderValuePartManipulator"/>
+    <completion.contributor language="Manifest" implementationClass="org.jetbrains.lang.manifest.completion.ManifestCompletionContributor"/>
+    <manifest.parser.provider implementation="org.jetbrains.lang.manifest.header.impl.StandardManifestHeaderParsers"/>
+
+    <applicationService serviceImplementation="org.jetbrains.lang.manifest.header.HeaderParserRepository"/>
+
+    <localInspection language="Manifest" displayName="Missing Final New Line" groupName="Manifest"
+                     enabledByDefault="true" level="ERROR" implementationClass="org.jetbrains.lang.manifest.highlighting.MissingFinalNewlineInspection"/>
+    <localInspection language="Manifest" displayName="Unknown or Misspelled Header Name" groupName="Manifest"
+                     enabledByDefault="true" level="WARNING" implementationClass="org.jetbrains.lang.manifest.highlighting.MisspelledHeaderInspection"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/plugins/tasks/tasks-tests/tasks-tests.iml b/plugins/tasks/tasks-tests/tasks-tests.iml
index 7281e97cfc50..deeddccdb91f 100644
--- a/plugins/tasks/tasks-tests/tasks-tests.iml
+++ b/plugins/tasks/tasks-tests/tasks-tests.iml
@@ -18,7 +18,6 @@
     <orderEntry type="module" module-name="xslt-debugger" />
     <orderEntry type="module" module-name="xdebugger-impl" scope="TEST" />
     <orderEntry type="module" module-name="git4idea" scope="TEST" />
-    <orderEntry type="module" module-name="manifest" scope="TEST" />
   </component>
 </module>
 
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 5f6c484bed22..602a51eca96d 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -10,6 +10,9 @@
   <xi:include href="/componentSets/Debugger.xml" xpointer="xpointer(/components/*)"/>
   <xi:include href="/META-INF/IntentionPowerPack.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/InspectionGadgets.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/ManifestSupport.xml" xpointer="xpointer(/idea-plugin/*)">
+    <xi:fallback/>
+  </xi:include>
 
   <application-components>
     <component>
@@ -222,8 +225,6 @@
     <extensionPoint name="java.compilerOutputIndex" area="IDEA_PROJECT"
                     interface="com.intellij.compilerOutputIndex.api.indexer.CompilerOutputBaseIndex"/>
     <extensionPoint name="vetoSPICondition" interface="com.intellij.openapi.util.Condition"/>
-
-    <extensionPoint name="manifest.parser.provider" interface="org.jetbrains.lang.manifest.header.HeaderParserProvider"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -1438,22 +1439,6 @@
     <lang.commenter language="SPI" implementationClass="com.intellij.spi.SPICommenter"/>
     <annotator language="SPI" implementationClass="com.intellij.spi.SPIAnnotator"/>
 
-    <fileTypeFactory implementation="org.jetbrains.lang.manifest.ManifestFileTypeFactory"/>
-    <lang.parserDefinition language="Manifest" implementationClass="org.jetbrains.lang.manifest.parser.ManifestParserDefinition"/>
-    <lang.syntaxHighlighterFactory key="Manifest" implementationClass="org.jetbrains.lang.manifest.highlighting.ManifestSyntaxHighlighterFactory"/>
-    <annotator language="Manifest" implementationClass="org.jetbrains.lang.manifest.highlighting.HeaderAnnotator"/>
-    <lang.elementManipulator forClass="org.jetbrains.lang.manifest.psi.HeaderValuePart"
-                             implementationClass="org.jetbrains.lang.manifest.psi.impl.HeaderValuePartManipulator"/>
-    <completion.contributor language="Manifest" implementationClass="org.jetbrains.lang.manifest.completion.ManifestCompletionContributor"/>
-    <manifest.parser.provider implementation="org.jetbrains.lang.manifest.header.impl.StandardManifestHeaderParsers"/>
-
-    <applicationService serviceImplementation="org.jetbrains.lang.manifest.header.HeaderParserRepository"/>
-
-    <localInspection language="Manifest" displayName="Missing Final New Line" groupName="Manifest"
-                     enabledByDefault="true" level="ERROR" implementationClass="org.jetbrains.lang.manifest.highlighting.MissingFinalNewlineInspection"/>
-    <localInspection language="Manifest" displayName="Unknown or Misspelled Header Name" groupName="Manifest"
-                     enabledByDefault="true" level="WARNING" implementationClass="org.jetbrains.lang.manifest.highlighting.MisspelledHeaderInspection"/>
-
     <gotoDeclarationHandler implementation="com.intellij.codeInsight.navigation.actions.GotoLambdaParameterHandler"/>
 
     <java.compilerOutputIndex implementation="com.intellij.compilerOutputIndex.impl.MethodsUsageIndex"/>
diff --git a/xml/tests/xml-tests.iml b/xml/tests/xml-tests.iml
index d49df962ac75..a6274e349d36 100644
--- a/xml/tests/xml-tests.iml
+++ b/xml/tests/xml-tests.iml
@@ -18,7 +18,6 @@
     <orderEntry type="module" module-name="xpath" scope="TEST" />
     <orderEntry type="module" module-name="dom-impl" scope="TEST" />
     <orderEntry type="library" name="XmlBeans" level="project" />
-    <orderEntry type="module" module-name="manifest" scope="RUNTIME" />
   </component>
   <component name="copyright">
     <Base>