diff --git a/deploy.gradle b/deploy.gradle
index d2d66530..606f25ad 100644
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -9,6 +9,7 @@ if (project.hasProperty("android")) {
     task javadoc(type: Javadoc) {
         source = android.sourceSets.main.java.srcDirs
         classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        classpath += project.android.libraryVariants.toList().first().javaCompileProvider.get().classpath
     }
 } else {
     task sourcesJar(type: Jar) {
diff --git a/vtm-web/build.gradle b/vtm-web/build.gradle
index dc252eb3..3f216843 100644
--- a/vtm-web/build.gradle
+++ b/vtm-web/build.gradle
@@ -75,6 +75,9 @@ gwt {
 //}
 
 javadoc {
+    if (JavaVersion.current().isJava9Compatible()) {
+        options.addStringOption("-release", "8")
+    }
     options.addStringOption("sourcepath", "")
 }