diff --git a/build.xml b/build.xml
index 334a9477b02..8ab9f20f35a 100644
--- a/build.xml
+++ b/build.xml
@@ -413,6 +413,21 @@
                 ]]></proguard>
             </else>
         </if>
+
+        <jar jarfile="${output}/kotlin-compiler-for-maven.jar">
+            <zipfileset src="${kotlin-home}/lib/kotlin-compiler.jar" includes="**"/>
+            <zipfileset src="${bootstrap.runtime}" includes="**" excludes="META-INF/**"/>
+
+            <manifest>
+                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+
+                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.compiler}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+
+                <attribute name="Main-Class" value="org.jetbrains.jet.cli.jvm.K2JVMCompiler"/>
+            </manifest>
+        </jar>
     </target>
 
     <target name="antTools">
diff --git a/libraries/tools/kotlin-compiler/pom.xml b/libraries/tools/kotlin-compiler/pom.xml
index 8838086c50d..5adfe9cdf17 100644
--- a/libraries/tools/kotlin-compiler/pom.xml
+++ b/libraries/tools/kotlin-compiler/pom.xml
@@ -74,7 +74,7 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <copy file="${kotlin-sdk}/lib/kotlin-compiler.jar"
+                                <copy file="${kotlin-dist}/kotlin-compiler-for-maven.jar"
                                       tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
                                       overwrite="true" verbose="true"/>
                             </tasks>