diff --git a/libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt b/libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt
index 5e5958cfc55..3b102ed11ce 100644
--- a/libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt
+++ b/libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt
@@ -91,6 +91,7 @@ class SiteGenerator(val sourceDir: File, val outputDir: File) : Runnable {
               <li class="active"><a href="#">Home</a></li>
               <li><a href="http://confluence.jetbrains.net/display/Kotlin/Welcome" title="All the documentation is in the wiki">Documentation</a></li>
               <li><a href="versions/snapshot/apidocs/index.html" title="Kotlin API documentation">API</a></li>
+              <li><a href="versions/snapshot/jsdocs/index.html" title="Kotlin JavaScript API documentation">JS</a></li>
               <li><a href="http://blog.jetbrains.com/kotlin/">Blog</a></li>
               <li><a href="http://stackoverflow.com/questions/tagged/kotlin" title="Frequently Asked Questions">FAQ</a></li>
               <li><a href="http://devnet.jetbrains.net/community/kotlin" title="Join us for some kool chat!">Forum</a></li>
diff --git a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
index 3099b4b423f..59e315fae06 100644
--- a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
+++ b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
@@ -42,9 +42,7 @@ class GenerateSiteTest : TestCase() {
         compiler.exec(System.out, args)
     }
 
-    // TODO seems to generate exception here - maybe native ctor/function related?
-    // https://github.com/JetBrains/kotlin/blob/master/compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java#L80
-    fun TODO_testGenerateJsKDoc(): Unit {
+    fun testGenerateJsKDoc(): Unit {
         val outDir = File(siteOutputDir, "versions/$versionDir/jsdocs")
         println("Generating JS KDocs to $outDir")
 
@@ -58,6 +56,10 @@ class GenerateSiteTest : TestCase() {
         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)