diff --git a/plugins/copyright/src/META-INF/java.xml b/plugins/copyright/src/META-INF/java.xml
new file mode 100644
index 000000000000..3792757d8ec7
--- /dev/null
+++ b/plugins/copyright/src/META-INF/java.xml
@@ -0,0 +1,7 @@
+<idea-plugin url="http://www.jetbrains.com/idea">
+  <extensions defaultExtensionNs="com.intellij.copyright">
+    <updater filetype="JSPX" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJspxFileCopyright$UpdateJspxCopyrightsProvider"/>
+    <updater filetype="JSP" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJspFileCopyright$UpdateJspCopyrightsProvider"/>
+    <updater filetype="JAVA" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJavaFileCopyright$UpdateJavaCopyrightsProvider"/>
+  </extensions>
+</idea-plugin>
diff --git a/plugins/copyright/src/META-INF/plugin.xml b/plugins/copyright/src/META-INF/plugin.xml
index 6a699a14a0af..fb67ea832789 100644
--- a/plugins/copyright/src/META-INF/plugin.xml
+++ b/plugins/copyright/src/META-INF/plugin.xml
@@ -8,11 +8,13 @@
         Copyright Notice. This plugin is used to ensure files in a project or module have
         a consistent copyright notice.
     </description>
+    <depends optional="true" config-file="java.xml">com.intellij.modules.java</depends>
+
     <extensions defaultExtensionNs="com.intellij">
       <projectConfigurable instance="com.maddyhome.idea.copyright.ui.CopyrightProjectConfigurable"/>
       <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
       <checkinHandlerFactory implementation="com.maddyhome.idea.copyright.actions.UpdateCopyrightCheckinHandlerFactory"/>
-      <projectService serviceInterface="com.maddyhome.idea.copyright.actions.UpdateCopyrightCheckinHandlerState" 
+      <projectService serviceInterface="com.maddyhome.idea.copyright.actions.UpdateCopyrightCheckinHandlerState"
                       serviceImplementation="com.maddyhome.idea.copyright.actions.UpdateCopyrightCheckinHandlerState"/>
     </extensions>
     <version>8.1</version>
@@ -26,9 +28,6 @@
     <extensions defaultExtensionNs="com.intellij.copyright">
       <updater filetype="XML" implementationClass="com.maddyhome.idea.copyright.psi.UpdateXmlCopyrightsProvider"/>
       <updater filetype="HTML" implementationClass="com.maddyhome.idea.copyright.psi.UpdateXmlCopyrightsProvider"/>
-      <updater filetype="JSPX" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJspxFileCopyright$UpdateJspxCopyrightsProvider"/>
-      <updater filetype="JSP" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJspFileCopyright$UpdateJspCopyrightsProvider"/>
-      <updater filetype="JAVA" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJavaFileCopyright$UpdateJavaCopyrightsProvider"/>
     </extensions>
     <extensionPoints>
       <extensionPoint name="updater" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
index 5b47b049cb19..f8769520f896 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
@@ -363,15 +363,7 @@ public class FileTypeUtil
             }
             else
             {
-                if (type.equals(StdFileTypes.JAVA))
-                {
-                    return true;
-                }
-                else if (type.equals(StdFileTypes.XML))
-                {
-                    return true;
-                }
-                else if (type.equals(StdFileTypes.DTD))
+                if (type.equals(StdFileTypes.DTD))
                 {
                     return true;
                 }
@@ -383,14 +375,6 @@ public class FileTypeUtil
                 {
                     return true;
                 }
-                else if (type.equals(StdFileTypes.JSP))
-                {
-                    return true;
-                }
-                else if (type.equals(StdFileTypes.JSPX))
-                {
-                    return true;
-                }
                 else if (type.equals(StdFileTypes.PROPERTIES))
                 {
                     return true;