diff --git a/CopyrightWaivers.txt b/CopyrightWaivers.txt
index 7ef479f1..4863b73b 100644
--- a/CopyrightWaivers.txt
+++ b/CopyrightWaivers.txt
@@ -40,3 +40,4 @@ egetman        | Evgeniy Getman, getman.eugene@gmail.com
 patriknw       | Patrik Nordwall, patrik.nordwall@gmail.com, Lightbend Inc
 angelsanz      | Ángel Sanz, angelsanz@users.noreply.github.com
 shenghaiyang   | 盛海洋, shenghaiyang@aliyun.com
+kiiadi         | Kyle Thomson, kylthoms@amazon.com, Amazon.com
diff --git a/api/build.gradle b/api/build.gradle
index 79d0aed2..6529a2bf 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1 +1,7 @@
-description = "reactive-streams"
\ No newline at end of file
+description = "reactive-streams"
+
+jar {
+    manifest {
+        attributes('Automatic-Module-Name': 'org.reactivestreams')
+    }
+}
diff --git a/examples/build.gradle b/examples/build.gradle
index 0ad0b07a..5258a5f1 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -3,4 +3,11 @@ dependencies {
     compile project(':reactive-streams')
     testCompile project(':reactive-streams-tck')
 }
+
+jar {
+    manifest {
+        attributes('Automatic-Module-Name': 'org.reactivestreams.examples')
+    }
+}
+
 test.useTestNG()
diff --git a/flow-adapters/build.gradle b/flow-adapters/build.gradle
index 0a90eb9e..8a7f1a96 100644
--- a/flow-adapters/build.gradle
+++ b/flow-adapters/build.gradle
@@ -6,8 +6,15 @@ dependencies {
     testCompile project(':reactive-streams-tck')
     testCompile group: 'org.testng', name: 'testng', version: '5.14.10'
 }
+
+jar {
+    manifest {
+        attributes('Automatic-Module-Name': 'org.reactivestreams.flowadapters')
+    }
+}
+
 test.useTestNG()
 
 javadoc {
-    options.links("http://download.java.net/java/jdk9/docs/api")
+    options.links("https://docs.oracle.com/javase/9/docs/api")
 }
\ No newline at end of file
diff --git a/tck-flow/build.gradle b/tck-flow/build.gradle
index 00642228..2ad8aa94 100644
--- a/tck-flow/build.gradle
+++ b/tck-flow/build.gradle
@@ -4,4 +4,11 @@ dependencies {
     compile project(':reactive-streams-tck')
     compile project(':reactive-streams-flow-adapters')
 }
+
+jar {
+    manifest {
+        attributes('Automatic-Module-Name': 'org.reactivestreams.tckflow')
+    }
+}
+
 test.useTestNG()
diff --git a/tck/build.gradle b/tck/build.gradle
index 52cd98cd..4ce22c8f 100644
--- a/tck/build.gradle
+++ b/tck/build.gradle
@@ -4,4 +4,11 @@ dependencies {
     compile project(':reactive-streams')
     compile project(':reactive-streams-examples')
 }
+
+jar {
+    manifest {
+        attributes('Automatic-Module-Name': 'org.reactivestreams.tck')
+    }
+}
+
 test.useTestNG()