diff --git a/build.xml b/build.xml
index 7202ef4a165..6e4566905ae 100644
--- a/build.xml
+++ b/build.xml
@@ -124,12 +124,16 @@
                 <!-- TODO Dirty Hack until kdoc jar has stdlib inside it -->
                 <pathelement location="${output}/classes/stdlib"/>
             </classpath>
+<!--
             <arg value="-src"/>
             <arg value="${basedir}/stdlib/ktSrc"/>
+-->
             <arg value="-output"/>
             <arg value="${output}/classes/stdlib"/>
             <arg value="-docOutput"/>
             <arg value="${output}/apidoc/stdlib"/>
+            <arg value="-module"/>
+            <arg value="${basedir}/modules/ApiDocsModule.kt"/>
         </java>
 
         <fail message="No stdlib API docs generated.">
diff --git a/modules/ApiDocsModule.kt b/modules/ApiDocsModule.kt
new file mode 100644
index 00000000000..91d45e37cd5
--- /dev/null
+++ b/modules/ApiDocsModule.kt
@@ -0,0 +1,11 @@
+import kotlin.modules.*
+
+fun project() {
+    module("apidocs") {
+        classpath += "kunit/lib/junit-4.9.jar"
+
+        addSourceFiles("../stdlib/ktSrc")
+        addSourceFiles("../stdlib/src")
+        addSourceFiles("../kunit/src/main/kotlin")
+    }
+}
\ No newline at end of file
diff --git a/modules/modules.iml b/modules/modules.iml
new file mode 100644
index 00000000000..ef582b1af94
--- /dev/null
+++ b/modules/modules.iml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+