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..4bc24d00 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.api')
+    }
+}
\ No newline at end of file
diff --git a/flow-adapters/build.gradle b/flow-adapters/build.gradle
index 0a90eb9e..15640a97 100644
--- a/flow-adapters/build.gradle
+++ b/flow-adapters/build.gradle
@@ -8,6 +8,12 @@ dependencies {
 }
 test.useTestNG()
 
+jar {
+    manifest {
+        attributes('Automatic-Module-Name': 'org.reactivestreams.flowbridge')
+    }
+}
+
 javadoc {
     options.links("http://download.java.net/java/jdk9/docs/api")
 }
\ No newline at end of file