diff --git a/libraries/build.gradle b/libraries/build.gradle
index 45302d49c09..45dc7272ff7 100644
--- a/libraries/build.gradle
+++ b/libraries/build.gradle
@@ -33,6 +33,10 @@ subprojects {
         compilerJarFile = bootstrapCompilerFile
     }
 
+    task javadocJar(type: Jar) {
+        classifier = 'javadoc'
+    }
+
     signing {
         required { project.ext.has('signing.keyId') }
         sign configurations.archives
@@ -81,21 +85,11 @@ static def commonJvmProjectConfiguration(Project project) {
         }
 
 
-        // TODO: use dokka instead?
-        javadoc {
-            failOnError = false
-        }
-
         task sourcesJar(type: Jar, dependsOn:classes) {
             classifier = 'sources'
             from sourceSets.main.kotlin
         }
 
-        task javadocJar(type: Jar, dependsOn:javadoc) {
-            classifier = 'javadoc'
-            from javadoc.destinationDir
-        }
-
         tasks.withType(JavaCompile) {
             sourceCompatibility = 1.6
             targetCompatibility = 1.6
diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle
index 873c6512f48..d85ddb5bbc5 100644
--- a/libraries/kotlin.test/common/build.gradle
+++ b/libraries/kotlin.test/common/build.gradle
@@ -23,22 +23,8 @@ jar {
     from("${rootDir}/../dist/kotlinc/build.txt") { into("META-INF/") }
 }
 
-
-// TODO: use dokka instead?
-javadoc {
-    failOnError = false
-}
-
 task sourcesJar(type: Jar, dependsOn:classes) {
     classifier = 'sources'
     from sourceSets.main.kotlin
 
 }
-
-task javadocJar(type: Jar, dependsOn:javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-
-
diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index e8eb1427d73..2aff3d953c6 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -40,16 +40,6 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from (sourceSets.main.allSource)
 }
 
-task emptyJavadoc(type: Javadoc) {
-    source = sourceSets.main.java
-    failOnError = false
-}
-
-task javadocJar(type: Jar, dependsOn: emptyJavadoc) {
-    classifier = 'javadoc'
-    from emptyJavadoc.destinationDir
-}
-
 artifacts {
     archives sourcesJar
     archives javadocJar
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index c467ac5ae18..03fb664b470 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -41,19 +41,8 @@ jar {
 }
 
 
-// TODO: use dokka instead?
-javadoc {
-    failOnError = false
-}
-
 task sourcesJar(type: Jar, dependsOn:classes) {
     classifier = 'sources'
     from sourceSets.main.kotlin
 
 }
-
-task javadocJar(type: Jar, dependsOn:javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle
index 2ddaff96407..044f63135ca 100644
--- a/libraries/stdlib/js/build.gradle
+++ b/libraries/stdlib/js/build.gradle
@@ -203,16 +203,6 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 }
 
 
-task emptyJavadoc(type: Javadoc) {
-    source = sourceSets.main.java
-    failOnError = false
-}
-
-task javadocJar(type: Jar, dependsOn: emptyJavadoc) {
-    classifier = 'javadoc'
-    from emptyJavadoc.destinationDir
-}
-
 artifacts {
     runtime mergedJar
     archives mergedJar