diff --git a/python/build/plugin-list.txt b/python/build/plugin-list.txt
index db626d21bdc2..2764a6dceb34 100644
--- a/python/build/plugin-list.txt
+++ b/python/build/plugin-list.txt
@@ -5,6 +5,7 @@ intellij.markdown
 intellij.platform.langInjection
 intellij.platform.remoteServers.git
 intellij.properties
+intellij.python.copyright
 intellij.python.ipnb
 intellij.python.langInjection
 intellij.python.reStructuredText
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index b323cc4f304a..092e5869dafc 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -41,6 +41,5 @@
     <orderEntry type="library" name="Slf4j" level="project" />
     <orderEntry type="library" name="netty-handler" level="project" />
     <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="module" module-name="intellij.copyright" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/python-copyright/intellij.python.copyright.iml b/python/python-copyright/intellij.python.copyright.iml
new file mode 100644
index 000000000000..a4ebe26966c5
--- /dev/null
+++ b/python/python-copyright/intellij.python.copyright.iml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.copyright" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.python.community.impl" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/python/python-copyright/resources/META-INF/plugin.xml b/python/python-copyright/resources/META-INF/plugin.xml
new file mode 100644
index 000000000000..2c93df2a7681
--- /dev/null
+++ b/python/python-copyright/resources/META-INF/plugin.xml
@@ -0,0 +1,12 @@
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+  <name>Python Copyright</name>
+  <id>org.jetbrains.plugins.python-copyright</id>
+  <version>VERSION</version>
+  <vendor>JetBrains</vendor>
+
+  <depends>com.intellij.modules.python</depends>
+  <depends>com.intellij.copyright</depends>
+
+  <xi:include href="/META-INF/python-terminal-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
+</idea-plugin>
diff --git a/python/src/META-INF/python-copyright.xml b/python/python-copyright/resources/META-INF/python-copyright-plugin.xml
similarity index 77%
rename from python/src/META-INF/python-copyright.xml
rename to python/python-copyright/resources/META-INF/python-copyright-plugin.xml
index 6ae381206c18..df4dfb7f4bed 100644
--- a/python/src/META-INF/python-copyright.xml
+++ b/python/python-copyright/resources/META-INF/python-copyright-plugin.xml
@@ -1,5 +1,5 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij.copyright">
-    <updater filetype="Python" implementationClass="com.jetbrains.python.PyUpdateCopyrightsProvider"/>
+    <updater filetype="Python" implementationClass="com.jetbrains.python.copyright.PyUpdateCopyrightsProvider"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/PyCopyright.kt b/python/python-copyright/src/com.jetbrains.python.copyright/PyCopyright.kt
similarity index 98%
rename from python/src/com/jetbrains/python/PyCopyright.kt
rename to python/python-copyright/src/com.jetbrains.python.copyright/PyCopyright.kt
index 39ffba39b77e..d4847e4e0a15 100644
--- a/python/src/com/jetbrains/python/PyCopyright.kt
+++ b/python/python-copyright/src/com.jetbrains.python.copyright/PyCopyright.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python
+package com.jetbrains.python.copyright
 
 import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.module.Module
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 2ce6fb3c5be3..6f5da3b36df5 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -9,8 +9,6 @@
   <!-- Enable command-line language -->
   <xi:include href="/META-INF/command-line.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <xi:include href="/META-INF/python-copyright.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
   <extensions defaultExtensionNs="com.intellij">
     <applicationInitializedListener implementation="com.jetbrains.python.testing.PyTestLegacyInteropInitializer"/>
     <psi.treeChangePreprocessor implementation="com.jetbrains.python.PythonPsiManager"/>