diff --git a/build.gradle b/build.gradle
index 815337b80..300ddbccd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -193,6 +193,16 @@ allprojects {
 			// work, we extra add '-quiet', which is added anyway by
 			// gradle.
 			options.addStringOption('Xdoclint:all', '-quiet')
+
+			// TODO: Add
+
+			// Treat warnings as errors.
+			// See also https://bugs.openjdk.java.net/browse/JDK-8200363
+			// options.addStringOption('Xwerror', '-quiet')
+
+			// after all javadoc warnings have been resolved and
+			// remove Xwerror from the subprojects build.gradle files
+			// (e.g. smack-android-extensions).
 		}
 	}
 	tasks.withType(Javadoc) {
diff --git a/smack-android-extensions/build.gradle b/smack-android-extensions/build.gradle
index 3279bdeb1..41da87346 100644
--- a/smack-android-extensions/build.gradle
+++ b/smack-android-extensions/build.gradle
@@ -7,3 +7,11 @@ dependencies {
 	compile project(':smack-android')
 	compile project(':smack-extensions')
 }
+
+if (JavaVersion.current().isJava8Compatible()) {
+	tasks.withType(Javadoc) {
+		// Treat warnings as errors.
+		// See also https://bugs.openjdk.java.net/browse/JDK-8200363
+		options.addStringOption('Xwerror', '-quiet')
+	}
+}