diff --git a/android/build.gradle b/android/build.gradle
index 482532e39..fbf4f99cd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -75,6 +75,14 @@ uploadArchives {
                 developerConnection 'scm:git@github.com:WhisperSystems/libaxolotl-android.git'
             }
 
+            licenses {
+                license {
+                    name 'GPLv3'
+                    url 'https://www.gnu.org/licenses/gpl-3.0.txt'
+                    distribution 'repo'
+                }
+            }
+
             developers {
                 developer {
                     name 'Moxie Marlinspike'
diff --git a/build.gradle b/build.gradle
index 0aa148e3e..9ba1f225e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,4 +16,12 @@ subprojects {
           'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
         ]
     }
+
+    if (JavaVersion.current().isJava8Compatible()) {
+        allprojects {
+            tasks.withType(Javadoc) {
+                options.addStringOption('Xdoclint:none', '-quiet')
+            }
+        }
+    }
 }
diff --git a/java/build.gradle b/java/build.gradle
index 11834e6b7..fdcc4313e 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -63,6 +63,14 @@ uploadArchives {
                 developerConnection 'scm:git@github.com:WhisperSystems/libaxolotl-android.git'
             }
 
+            licenses {
+                license {
+                    name 'GPLv3'
+                    url 'https://www.gnu.org/licenses/gpl-3.0.txt'
+                    distribution 'repo'
+                }
+            }
+
             developers {
                 developer {
                     name 'Moxie Marlinspike'
@@ -81,3 +89,22 @@ task installArchives(type: Upload) {
         }
     }
 }
+
+task packageJavadoc(type: Jar, dependsOn: 'javadoc') {
+    from javadoc.destinationDir
+    classifier = 'javadoc'
+}
+
+task packageSources(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'sources'
+}
+
+artifacts {
+    archives(packageJavadoc) {
+        type = 'javadoc'
+    }
+
+    archives packageSources
+}
+