diff --git a/.idea/libraries/copyright_plugin.xml b/.idea/libraries/copyright_plugin.xml
new file mode 100644
index 00000000000..6c782f6edbe
--- /dev/null
+++ b/.idea/libraries/copyright_plugin.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="copyright-plugin">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/copyright/lib/copyright.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/copyright/src" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/idea/idea.iml b/idea/idea.iml
index 267ce11864d..827ac8384c5 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -26,6 +26,7 @@
     <orderEntry type="module" module-name="jet.as.java.psi" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="junit-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="copyright-plugin" level="project" />
     <orderEntry type="module" module-name="j2k" />
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="module" module-name="cli" scope="TEST" />
diff --git a/idea/src/META-INF/kotlin-copyright.xml b/idea/src/META-INF/kotlin-copyright.xml
new file mode 100644
index 00000000000..9c48036cf54
--- /dev/null
+++ b/idea/src/META-INF/kotlin-copyright.xml
@@ -0,0 +1,5 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij.copyright">
+    <updater filetype="Kotlin" implementationClass="org.jetbrains.jet.plugin.copyright.UpdateKotlinCopyrightsProvider"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index af1b038ae84..ba195144123 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -9,6 +9,7 @@
   <idea-version since-build="123.4" until-build="124.9999" />
 
   <depends optional="true">JUnit</depends>
+  <depends optional="true" config-file="kotlin-copyright.xml">com.intellij.copyright</depends>
 
   <project-components>
       <component>
@@ -254,4 +255,8 @@
       <project.converterProvider implementation="org.jetbrains.jet.plugin.converters.JetRunConfigurationSettingsFormatConverterProvider"/>
 
   </extensions>
+
+  <extensionPoints>
+    <extensionPoint name="updater" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyright.java b/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyright.java
new file mode 100644
index 00000000000..16435ec7ad2
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyright.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.copyright;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiComment;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiWhiteSpace;
+import com.maddyhome.idea.copyright.CopyrightProfile;
+import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright;
+
+class UpdateKotlinCopyright extends UpdatePsiFileCopyright {
+
+    UpdateKotlinCopyright(Project project, Module module, VirtualFile root, CopyrightProfile copyrightProfile) {
+        super(project, module, root, copyrightProfile);
+    }
+
+    @Override
+    protected void scanFile() {
+        PsiElement first = getFile().getFirstChild();
+        PsiElement last = first;
+        PsiElement next = first;
+        while (next != null) {
+            if (next instanceof PsiComment || next instanceof PsiWhiteSpace) {
+                next = getNextSibling(next);
+            }
+            else {
+                break;
+            }
+            last = next;
+        }
+
+        if (first != null) {
+            checkComments(first, last, true);
+        }
+    }
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyrightsProvider.java b/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyrightsProvider.java
new file mode 100644
index 00000000000..b26996f810e
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyrightsProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.copyright;
+
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.maddyhome.idea.copyright.CopyrightProfile;
+import com.maddyhome.idea.copyright.psi.UpdateCopyright;
+import com.maddyhome.idea.copyright.psi.UpdateCopyrightsProvider;
+
+public class UpdateKotlinCopyrightsProvider extends UpdateCopyrightsProvider {
+    @Override
+    public UpdateCopyright createInstance(Project project, Module module, VirtualFile file, FileType base, CopyrightProfile options) {
+        return new UpdateKotlinCopyright(project, module, file, options);
+    }
+}