diff --git a/build.xml b/build.xml
index 394060afaf6..84bacc2e3b6 100644
--- a/build.xml
+++ b/build.xml
@@ -106,8 +106,8 @@
         <jar destfile="${kotlin-home}/lib/kotlin-runtime.jar">
             <fileset dir="${output}/classes/runtime"/>
             <fileset dir="${output}/classes/stdlib"/>
-            <fileset dir="${basedir}/runtime" includes="src/**/*" />
-            <fileset dir="${basedir}/libraries/stdlib" includes="src/**/*" />
+            <fileset dir="${basedir}/runtime" includes="src/**/*"/>
+            <fileset dir="${basedir}/libraries/stdlib" includes="src/**/*"/>
         </jar>
     </target>
 
@@ -159,12 +159,64 @@
     </target>
 
     <target name="jar" depends="compile">
-        <jar destfile="${kotlin-home}/lib//kotlin-compiler.jar">
+        <jar destfile="${kotlin-home}/lib/kotlin-compiler.jar">
             <fileset dir="${output}/classes/compiler"/>
             <fileset dir="${basedir}/compiler/frontend/src" includes="jet/**"/>
         </jar>
     </target>
 
+    <target name="jarjar">
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/build/jarjar-1.2.jar"/>
+
+        <jarjar jarfile="${output}/kotlin-compiler-tmp.jar">
+            <fileset dir="${output}/classes/compiler"/>
+            <fileset dir="${output}/classes/runtime"/>
+            <fileset dir="${basedir}/compiler/frontend/src" includes="jet/**"/>
+
+            <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
+            <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar"/>
+
+            <rule pattern="com.intellij.**" result="kotlinc.internal.com.intellij.@1"/>
+            <rule pattern="org.intellij.lang.annotations.**" result="kotlinc.internal.org.intellij.lang.annotations.@1"/>
+            <rule pattern="org.jetbrains.annotations.**" result="kotlinc.internal.org.jetbrains.annotations.@1"/>
+            <rule pattern="com.google.**" result="kotlinc.internal.com.google.@1"/>
+            <rule pattern="org.objectweb.asm.**" result="kotlinc.internal.org.objectweb.asm.@1"/>
+            <rule pattern="com.sampullara.cli.**" result="kotlinc.internal.com.sampullara.cli.@1"/>
+            <rule pattern="org.picocontainer.**" result="kotlinc.internal.org.picocontainer.@1"/>
+            <rule pattern="gnu.trove.**" result="kotlinc.internal.gnu.trove.@1"/>
+            <rule pattern="javax.inject.**" result="kotlinc.internal.javax.inject.@1"/>
+        </jarjar>
+
+        <delete failonerror="false" dir="${output}/kotlin-compiler.exploded"/>
+        <mkdir dir="${output}/kotlin-compiler.exploded"/>
+
+        <unzip src="${output}/kotlin-compiler-tmp.jar" dest="${output}/kotlin-compiler.exploded"/>
+        <delete file="${output}/kotlin-compiler-tmp.jar"/>
+
+        <jar jarfile="${output}/kotlin-compiler-standalone.jar">
+            <fileset dir="${kotlin-home}/lib/kotlin-compiler.exploded">
+                <include name="**/*.class"/>
+                <include name="**/*.jet"/>
+                <include name="**/*.jet.src"/>
+                <include name="**/*.kt"/>
+                <include name="/META-INF/services/**"/>
+                <include name="/messages/**"/>
+            </fileset>
+
+            <manifest>
+                <attribute name="Built-By" value="JetBrains"/>
+
+                <attribute name="Implementation-Vendor" value="JetBrains"/>
+                <attribute name="Implementation-Title" value="Kotlin Compiler"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+
+                <attribute name="Main-Class" value="org.jetbrains.jet.cli.KotlinCompiler"/>
+            </manifest>
+        </jar>
+
+        <delete dir="${output}/kotlin-compiler.exploded" />
+    </target>
+
     <target name="clean">
         <delete dir="${output}"/>
     </target>
@@ -183,7 +235,7 @@
         <chmod dir="${kotlin-home}/bin" includes="*" perm="755"/>
     </target>
 
-    <target name="dist" depends="init,copyKotlinJars,jar,buildToolsJar,jarJDKHeaders,jarRT,jarLang"/>
+    <target name="dist" depends="init,copyKotlinJars,jar,buildToolsJar,jarJDKHeaders,jarRT,jarLang,jarjar"/>
 
     <target name="doc" depends="dist"/>
 
diff --git a/build/jarjar-1.2.jar b/build/jarjar-1.2.jar
new file mode 100644
index 00000000000..e32d30cd2ac
Binary files /dev/null and b/build/jarjar-1.2.jar differ