diff --git a/build.xml b/build.xml
index ba2636418c0..fe4f1739a3c 100644
--- a/build.xml
+++ b/build.xml
@@ -22,19 +22,21 @@
         <fileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
     </path>
 
-    <path id="sourcepath">
-        <dirset dir="${basedir}/">
-            <include name="compiler/frontend/src"/>
-            <include name="compiler/frontend.java/src"/>
-            <include name="compiler/backend/src"/>
-            <include name="compiler/cli/src"/>
-            <include name="compiler/util/src"/>
-            <include name="compiler/jet.as.java.psi/src"/>
+    <dirset id="compilerSources.dirset" dir="${basedir}/">
+        <include name="compiler/frontend/src"/>
+        <include name="compiler/frontend.java/src"/>
+        <include name="compiler/backend/src"/>
+        <include name="compiler/cli/src"/>
+        <include name="compiler/util/src"/>
+        <include name="compiler/jet.as.java.psi/src"/>
 
-            <include name="runtime/src"/>
+        <include name="runtime/src"/>
 
-            <include name="js/js.translator/src"/>
-        </dirset>
+        <include name="js/js.translator/src"/>
+    </dirset>
+
+    <path id="compilerSources.path">
+        <dirset refid="compilerSources.dirset"/>
     </path>
 
     <macrodef name="cleandir">
@@ -75,7 +77,7 @@
         <cleandir dir="${output}/classes/injectorsGenerator"/>
         <javac destdir="${output}/classes/injectorsGenerator" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
             <src path="injector-generator/src"/>
-            <src refid="sourcepath"/>
+            <src refid="compilerSources.path"/>
             <classpath refid="classpath"/>
         </javac>
     </target>
@@ -87,6 +89,46 @@
         </java>
     </target>
 
+    <target name="compilerSources">
+        <jar jarfile="${output}/kotlin-compiler-sources.jar">
+            <!-- TODO How to convert it from pathset or dirset ? -->
+            <fileset dir="compiler/frontend/src"/>
+            <fileset dir="compiler/frontend.java/src"/>
+            <fileset dir="compiler/backend/src"/>
+            <fileset dir="compiler/cli/src"/>
+            <fileset dir="compiler/util/src"/>
+            <fileset dir="compiler/jet.as.java.psi/src"/>
+            <fileset dir="runtime/src"/>
+            <fileset dir="js/js.translator/src"/>
+
+            <manifest>
+                <attribute name="Built-By" value="JetBrains"/>
+
+                <attribute name="Implementation-Vendor" value="JetBrains"/>
+                <attribute name="Implementation-Title" value="Kotlin Compiler Sources"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
+
+        <delete dir="${output}/kotlin-compiler-javadoc" failonerror="false" />
+        <javadoc destdir="${output}/kotlin-compiler-javadoc"
+                 sourcepathref="compilerSources.path"
+                 classpathref="classpath"
+                 linksource="yes"
+                 windowtitle="Kotlin Compiler" />
+        <jar jarfile="${output}/kotlin-compiler-javadoc.jar">
+            <fileset dir="${output}/kotlin-compiler-javadoc"/>
+
+            <manifest>
+                <attribute name="Built-By" value="JetBrains"/>
+
+                <attribute name="Implementation-Vendor" value="JetBrains"/>
+                <attribute name="Implementation-Title" value="Kotlin Compiler Javadoc"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
+    </target>
+
     <target name="compiler">
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/dependencies/jarjar.jar"/>
         <taskdef resource="proguard/ant/task.properties" classpath="${basedir}/dependencies/proguard.jar"/>
@@ -94,12 +136,11 @@
 
         <cleandir dir="${output}/classes/compiler"/>
         <javac destdir="${output}/classes/compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
-            <src refid="sourcepath"/>
+            <src refid="compilerSources.path"/>
             <classpath refid="classpath"/>
         </javac>
 
         <!-- JarJar Kotlin compiler & dependencies -->
-        <delete file="${output}/kotlin-compiler-jarjar.jar" failonerror="false"/>
         <jarjar jarfile="${output}/kotlin-compiler-jarjar.jar">
             <fileset dir="${output}/classes/compiler"/>
             <fileset dir="${basedir}/compiler/frontend/src" includes="jet/**"/>
@@ -167,7 +208,6 @@
                 <unzip src="${output}/kotlin-compiler-jarjar.jar" dest="${output}/kotlin-compiler.exploded"/>
 
                 <!-- Clean JarJar result -->
-                <delete file="${output}/kotlin-compiler-before-proguard.jar" failonerror="false"/>
                 <jar jarfile="${output}/kotlin-compiler-before-proguard.jar"
                      manifest="${output}/kotlin-compiler.exploded/META-INF/MANIFEST.MF">
 
@@ -267,7 +307,6 @@
             </classpath>
         </javac>
 
-        <delete file="${kotlin-home}/lib/kotlin-ant.jar" failonerror="false"/>
         <jar destfile="${kotlin-home}/lib/kotlin-ant.jar">
             <fileset dir="${output}/classes/buildTools"/>
             <fileset dir="${basedir}/build-tools/ant/src" includes="**/*.xml"/>
@@ -299,7 +338,6 @@
             <arg value="jdkHeaders"/>
         </java>
 
-        <delete file="${kotlin-home}/lib/alt/kotlin-jdk-headers.jar" failonerror="false"/>
         <jar destfile="${kotlin-home}/lib/alt/kotlin-jdk-headers.jar">
             <fileset dir="${output}/classes/jdk-headers"/>
         </jar>
@@ -327,7 +365,6 @@
             <arg value="${output}/classes/runtime"/>
         </java>
 
-        <delete file="${kotlin-home}/lib/kotlin-runtime.jar" failonerror="false"/>
         <jar destfile="${kotlin-home}/lib/kotlin-runtime.jar">
             <fileset dir="${output}/classes/runtime"/>
             <fileset dir="${output}/classes/stdlib"/>
@@ -359,7 +396,7 @@
     </target>
 
     <target name="dist"
-            depends="init,prepareDist,injectorsGenerator,generateInjectors,compiler,antTools,jdkHeaders,runtime,lang"/>
+            depends="init,prepareDist,injectorsGenerator,generateInjectors,compiler,compilerSources,antTools,jdkHeaders,runtime,lang"/>
 
     <target name="zip" depends="dist">
         <zip destfile="${output}/${output.name}.zip">
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 56ddae4c708..4d46e650692 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -19,7 +19,8 @@
         <guava.version>11.0.2</guava.version>
         <junit-version>4.10</junit-version>
         <kotlin-maven-plugin.version>0.2.3.8</kotlin-maven-plugin.version>
-        <kotlin-sdk>${project-root}/dist/kotlinc</kotlin-sdk>
+        <kotlin-dist>${project-root}/dist</kotlin-dist>
+        <kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
         <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
diff --git a/libraries/tools/kotlin-install/pom.xml b/libraries/tools/kotlin-install/pom.xml
index 35eaea9a2e9..7388d8a7318 100644
--- a/libraries/tools/kotlin-install/pom.xml
+++ b/libraries/tools/kotlin-install/pom.xml
@@ -39,6 +39,8 @@
                             <version>${project.version}</version>
                             <packaging>jar</packaging>
                             <file>${kotlin-sdk}/lib/kotlin-compiler.jar</file>
+                            <sources>${kotlin-dist}/kotlin-compiler-sources.jar</sources>
+                            <javadoc>${kotlin-dist}/kotlin-compiler-javadoc.jar</javadoc>
                             <createChecksum>true</createChecksum>
                             <generatePom>true</generatePom>
                         </configuration>
@@ -61,6 +63,8 @@
                             <version>${project.version}</version>
                             <packaging>jar</packaging>
                             <file>${kotlin-sdk}/lib/kotlin-compiler.jar</file>
+                            <sources>${kotlin-dist}/kotlin-compiler-sources.jar</sources>
+                            <javadoc>${kotlin-dist}/kotlin-compiler-javadoc.jar</javadoc>
                             <generatePom>true</generatePom>
                             <repositoryId>jetbrains-kotlin</repositoryId>
                             <url>http://repository.jetbrains.com/kotlin</url>