diff --git a/build.xml b/build.xml
index 02516724828..8afdb189435 100644
--- a/build.xml
+++ b/build.xml
@@ -734,6 +734,20 @@
                 <attribute name="Implementation-Version" value="${build.number}"/>
             </manifest>
         </jar>
+
+        <jar jarfile="${output}/kotlin-daemon-client-sources.jar">
+            <fileset dir="compiler/daemon/daemon-common/src"/>
+            <fileset dir="compiler/daemon/daemon-client/src"/>
+            <zipfileset file="${kotlin-home}/build.txt" prefix="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.daemon.client.sources}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
     </target>
 
     <target name="android-extensions-compiler">
diff --git a/libraries/tools/kotlin-daemon-client/pom.xml b/libraries/tools/kotlin-daemon-client/pom.xml
new file mode 100644
index 00000000000..695edcff641
--- /dev/null
+++ b/libraries/tools/kotlin-daemon-client/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
+        <maven.version>3.0.4</maven.version>
+    </properties>
+
+    <parent>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
+        <version>1.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>kotlin-daemon-client</artifactId>
+    <packaging>jar</packaging>
+
+    <description>the Kotlin compile daemon client</description>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>empty-sources-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <skipIfEmpty>false</skipIfEmpty>
+                            <classifier>sources</classifier>
+                            <classesDirectory>${basedir}/sources</classesDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-jar</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <copy file="${kotlin-dist}/kotlinc/lib/kotlin-daemon-client.jar"
+                                      tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
+                                      overwrite="true" verbose="true"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>
diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
index df2a658599b..9bb554fb986 100644
--- a/resources/kotlinManifest.properties
+++ b/resources/kotlinManifest.properties
@@ -21,6 +21,7 @@ manifest.impl.title.kotlin.runner=Kotlin Runner
 manifest.impl.title.kotlin.test=Kotlin Testing library
 
 manifest.impl.title.kotlin.daemon-client=Kotlin Compile Daemon Client
+manifest.impl.title.kotlin.daemon.client.sources=Kotlin Compile Daemon Client Sources
 
 manifest.impl.title.kotlin.build.common=Kotlin Build Common
 manifest.impl.title.kotlin.build.common.sources=Kotlin Build Common Sources