diff --git a/libraries/kotlin-java/pom.xml b/libraries/kotlin-java/pom.xml
index 3679eba9829..644a2f2fa79 100644
--- a/libraries/kotlin-java/pom.xml
+++ b/libraries/kotlin-java/pom.xml
@@ -14,20 +14,11 @@
     <artifactId>kotlin-java</artifactId>
 
     <dependencies>
-<!--
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>stdlib</artifactId>
             <version>${project.version}</version>
         </dependency>
--->
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
-            <version>${project.version}</version>
-            <scope>system</scope>
-            <systemPath>${kotlin-sdk}/lib/kotlin-runtime.jar</systemPath>
-        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index b7a8adf1e80..d031eef2394 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -20,6 +20,7 @@
         <maven.compiler.target>1.6</maven.compiler.target>
         <pegdown.version>1.1.0</pegdown.version>
         <surefire-version>2.5</surefire-version>
+        <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
     </properties>
 
     <repositories>
@@ -65,7 +66,7 @@
                         </execution>
                     </executions>
                     <configuration>
-                      <verbose>false</verbose>
+                        <verbose>false</verbose>
                     </configuration>
                 </plugin>
 
@@ -82,6 +83,20 @@
         </pluginManagement>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven-jar-plugin.version}</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire-version}</version>
@@ -109,33 +124,33 @@
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
 
     <profiles>
-      <profile>
-        <id>localKotlin</id>
-        <build>
-          <pluginManagement>
-            <plugins>
-              <plugin>
-                  <groupId>com.github.goldin</groupId>
-                  <artifactId>kotlin-maven-plugin</artifactId>
-                  <version>${kotlin-maven-plugin.version}</version>
-                  <configuration>
-                    <kotlinJars>
-                      <jar>${kotlin-sdk}/lib/kotlin-build-tools.jar</jar>
-                      <jar>${kotlin-sdk}/lib/kotlin-compiler.jar</jar>
-                      <jar>${kotlin-sdk}/lib/kotlin-runtime.jar</jar>
-                      <jar>${kotlin-sdk}/lib/intellij-core.jar</jar>
-                      <jar>${kotlin-sdk}/lib/picocontainer.jar</jar>
-                      <jar>${kotlin-sdk}/lib/trove4j.jar</jar>
-                      <jar>${kotlin-sdk}/lib/guava-11.0.1.jar</jar>
-                      <jar>${kotlin-sdk}/lib/asm-commons.jar</jar>
-                      <jar>${kotlin-sdk}/lib/asm.jar</jar>
-                    </kotlinJars>
-                  </configuration>
-              </plugin>
-            </plugins>
-          </pluginManagement>
-        </build>
-      </profile>
+        <profile>
+            <id>localKotlin</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>com.github.goldin</groupId>
+                            <artifactId>kotlin-maven-plugin</artifactId>
+                            <version>${kotlin-maven-plugin.version}</version>
+                            <configuration>
+                                <kotlinJars>
+                                    <jar>${kotlin-sdk}/lib/kotlin-build-tools.jar</jar>
+                                    <jar>${kotlin-sdk}/lib/kotlin-compiler.jar</jar>
+                                    <jar>${kotlin-sdk}/lib/kotlin-runtime.jar</jar>
+                                    <jar>${kotlin-sdk}/lib/intellij-core.jar</jar>
+                                    <jar>${kotlin-sdk}/lib/picocontainer.jar</jar>
+                                    <jar>${kotlin-sdk}/lib/trove4j.jar</jar>
+                                    <jar>${kotlin-sdk}/lib/guava-11.0.1.jar</jar>
+                                    <jar>${kotlin-sdk}/lib/asm-commons.jar</jar>
+                                    <jar>${kotlin-sdk}/lib/asm.jar</jar>
+                                </kotlinJars>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
     </profiles>
 
 </project>
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index 6261fe31a8d..f9e45adc27e 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -31,6 +31,17 @@
     <build>
         <sourceDirectory>${project.basedir}/src</sourceDirectory>
         <testSourceDirectory>${project.basedir}/test</testSourceDirectory>
+
+        <resources>
+            <resource>
+                <directory>${kotlin-sdk}/../classes/runtime</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.class</include>
+                </includes>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <groupId>com.github.goldin</groupId>