diff --git a/libraries/docs/jsdoc/pom.xml b/libraries/docs/jsdoc/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8492b4cfbeda847ca0459f3c5b4438bae28d16fe
--- /dev/null
+++ b/libraries/docs/jsdoc/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>
+
+    <parent>
+        <groupId>org.jetbrains.kotlin.docs</groupId>
+        <artifactId>docs</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jsdoc</artifactId>
+
+    <properties>
+        <js.lib.dir>${basedir}/../../../js/js.libraries</js.lib.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>stdlib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+      <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>${junit-version}</version>
+      </dependency>
+    </dependencies>
+
+    <build>
+      <plugins>
+          <plugin>
+              <groupId>org.jetbrains.kotlin</groupId>
+              <artifactId>kdoc-maven-plugin</artifactId>
+              <version>${project.version}</version>
+              <configuration>
+                  <sources>
+                      <source>${js.lib.dir}/src/core</source>
+                      <source>${js.lib.dir}/src/html5</source>
+                      <source>${js.lib.dir}/src/jquery</source>
+                      <source>${js.lib.dir}/src/raphael</source>
+                  </sources>
+                  <title>Kotlin JavaScript API (${project.version})</title>
+                  <ignorePackages>
+                      <ignorePackage>com</ignorePackage>
+                      <ignorePackage>sun</ignorePackage>
+                      <ignorePackage>java</ignorePackage>
+                      <ignorePackage>jet</ignorePackage>
+                      <ignorePackage>junit</ignorePackage>
+                      <ignorePackage>org</ignorePackage>
+                  </ignorePackages>
+
+              </configuration>
+
+              <executions>
+                  <execution>
+                      <id>apidoc</id>
+                      <phase>install</phase>
+                      <goals>
+                          <goal>apidoc</goal>
+                      </goals>
+                  </execution>
+              </executions>
+          </plugin>
+      </plugins>
+    </build>
+</project>
diff --git a/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt b/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
index 49295acc11e91950f5ff66c56df0dd7a4de48392..d4a1a45faa20735e0ff1057a96edbb45eb3a1780 100644
--- a/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
+++ b/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
@@ -17,67 +17,31 @@ class GenerateSiteTest : TestCase() {
     }
 
     fun testCopyApiDocs(): Unit {
-        val outDir = File(siteOutputDir, "versions/$versionDir/apidocs")
-        println("Generating library KDocs to $outDir")
-
-        copyDocResources(outDir)
-
         val apidocDir = File(siteOutputDir, "../../../apidoc/target/site/apidocs")
         assertTrue(apidocDir.exists(), "Directory does not exist ${apidocDir.getCanonicalPath()}")
 
-
-        copyRecursive(apidocDir, outDir)
-    }
-
-    /*
-    fun testGenerateStdlibKDoc(): Unit {
         val outDir = File(siteOutputDir, "versions/$versionDir/apidocs")
-        println("Generating library KDocs to $outDir")
+        println("Copying API docs to $outDir")
 
         copyDocResources(outDir)
-        val args = KDocArguments()
-        args.setModule("../kdoc/ApiDocsModule.kt")
-        args.setOutputDir("target/classes-stdlib")
-
-        val config = args.docConfig
-        config.docOutputDir = outDir.getCanonicalPath()!!
-        config.title = "Kotlin API ($version)"
-        config.version = version
-        config.ignorePackages.add("kotlin.support")
-        config.ignorePackages.add("org.jetbrains.kotlin")
-        config.ignorePackages.add("java")
-        config.ignorePackages.add("jet")
-        config.ignorePackages.add("junit")
-        config.ignorePackages.add("sun")
-        config.ignorePackages.add("org")
-
-        val compiler = KDocCompiler()
-        compiler.exec(System.out, args)
+        copyRecursive(apidocDir, outDir)
     }
 
-    fun testGenerateJsKDoc(): Unit {
+    fun testCopyJSApiDocs(): Unit {
+        val apidocDir = File(siteOutputDir, "../../../jsdoc/target/site/apidocs")
+        //assertTrue(apidocDir.exists(), "Directory does not exist ${apidocDir.getCanonicalPath()}")
+        if (!apidocDir.exists()) {
+            println("WARNING - no JS API docs available. Though they don't work right now so are optional :)")
+            return
+        }
+
         val outDir = File(siteOutputDir, "versions/$versionDir/jsdocs")
-        println("Generating JS KDocs to $outDir")
+        println("Copying JavaScript API docs to $outDir")
 
         copyDocResources(outDir)
-        val args = KDocArguments()
-        args.setModule("../../js/js.libraries/module.kt")
-        args.setOutputDir("target/classes-js")
-
-        val config = args.docConfig
-        config.docOutputDir = outDir.getCanonicalPath()!!
-        config.title = "Kotlin JS API ($version)"
-        config.version = version
-        config.ignorePackages.add("java")
-        config.ignorePackages.add("jet")
-        config.ignorePackages.add("junit")
-        config.ignorePackages.add("org")
-        config.ignorePackages.add("sun")
 
-        val compiler = KDocCompiler()
-        compiler.exec(System.out, args)
+        copyRecursive(apidocDir, outDir)
     }
-    */
 
     fun copyDocResources(outDir: File): Unit {
         val sourceDir = File(srcDir, "../apidocs")