diff --git a/build.xml b/build.xml
index 9376d85ee25..acd0809bada 100644
--- a/build.xml
+++ b/build.xml
@@ -801,7 +801,7 @@
     </target>
 
     <target name="compiler-client-embeddable">
-        <cleandir dir="${output}/classes/android-extensions/compiler-client-embeddable"/>
+        <cleandir dir="${output}/classes/compiler-client-embeddable"/>
         <javac2 destdir="${output}/classes/compiler-client-embeddable" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
             <withKotlin modulename="compiler-deps">
                 <compilerarg value="-version"/>
@@ -832,6 +832,20 @@
                 <attribute name="Class-Path" value="kotlin-stdlib.jar"/>
             </manifest>
         </jarjar>
+
+        <jar jarfile="${output}/kotlin-compiler-client-embeddable-sources.jar">
+            <fileset dir="compiler/cli/cli-common/src"/>
+            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+            <zipfileset src="${output}/kotlin-daemon-client-sources.jar"/>
+
+            <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.client.embeddable.sources}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
     </target>
 
     <target name="android-extensions-compiler">
diff --git a/libraries/tools/kotlin-compiler-client-embeddable/pom.xml b/libraries/tools/kotlin-compiler-client-embeddable/pom.xml
index 010f6da3401..163d3370e37 100644
--- a/libraries/tools/kotlin-compiler-client-embeddable/pom.xml
+++ b/libraries/tools/kotlin-compiler-client-embeddable/pom.xml
@@ -24,22 +24,34 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.7</version>
                 <executions>
                     <execution>
-                        <id>empty-sources-jar</id>
-                        <phase>package</phase>
+                        <id>attach-artifacts</id>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>attach-artifact</goal>
                         </goals>
                         <configuration>
-                            <skipIfEmpty>false</skipIfEmpty>
-                            <classifier>sources</classifier>
-                            <classesDirectory>${basedir}/sources</classesDirectory>
+                            <artifacts>
+                                <artifact>
+                                    <file>${kotlin-dist}/kotlin-compiler-client-embeddable-sources.jar</file>
+                                    <type>jar</type>
+                                    <classifier>sources</classifier>
+                                </artifact>
+                            </artifacts>
                         </configuration>
                     </execution>
+
+                    <execution>
+                        <id>attach-empty-javadoc</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
 
diff --git a/libraries/tools/kotlin-daemon-client/pom.xml b/libraries/tools/kotlin-daemon-client/pom.xml
index e136a3e3cc8..e57d95f4785 100644
--- a/libraries/tools/kotlin-daemon-client/pom.xml
+++ b/libraries/tools/kotlin-daemon-client/pom.xml
@@ -25,22 +25,34 @@
         <plugins>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.7</version>
                 <executions>
                     <execution>
-                        <id>empty-sources-jar</id>
-                        <phase>package</phase>
+                        <id>attach-artifacts</id>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>attach-artifact</goal>
                         </goals>
                         <configuration>
-                            <skipIfEmpty>false</skipIfEmpty>
-                            <classifier>sources</classifier>
-                            <classesDirectory>${basedir}/sources</classesDirectory>
+                            <artifacts>
+                                <artifact>
+                                    <file>${kotlin-dist}/kotlin-daemon-client-sources.jar</file>
+                                    <type>jar</type>
+                                    <classifier>sources</classifier>
+                                </artifact>
+                            </artifacts>
                         </configuration>
                     </execution>
+
+                    <execution>
+                        <id>attach-empty-javadoc</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>