diff --git a/asciidoctorj-api/build.gradle b/asciidoctorj-api/build.gradle
index a98baaee..975ec3c1 100644
--- a/asciidoctorj-api/build.gradle
+++ b/asciidoctorj-api/build.gradle
@@ -11,6 +11,11 @@ jar {
     ('Bundle-Name'): 'asciidoctorj-api',
     ('Bundle-SymbolicName'): 'org.asciidoctor.asciidoctorj-api',
   )
+  manifest {
+    attributes(
+      'Automatic-Module-Name': 'org.asciidoctor.asciidoctorj.api'
+    )
+  }
 }
 
 ext.publicationName = "mavenAsciidoctorJApi"
diff --git a/asciidoctorj-cli/build.gradle b/asciidoctorj-cli/build.gradle
index 9a869d6b..2b6cc96d 100644
--- a/asciidoctorj-cli/build.gradle
+++ b/asciidoctorj-cli/build.gradle
@@ -23,5 +23,10 @@ jar {
     ('Bundle-SymbolicName'): 'org.asciidoctor.asciidoctorj-cli',
     ('Import-Package'): 'com.beust.jcommander;resolution:=optional, *'
   )
+  manifest {
+    attributes(
+      'Automatic-Module-Name': 'org.asciidoctor.asciidoctorj.cli'
+    )
+  }
   metaInf { from "$buildDir/version-info/" }
 }
diff --git a/asciidoctorj-core/build.gradle b/asciidoctorj-core/build.gradle
index e5857da1..0c5697de 100644
--- a/asciidoctorj-core/build.gradle
+++ b/asciidoctorj-core/build.gradle
@@ -91,6 +91,11 @@ jar {
     ('Bundle-Name'): 'asciidoctorj',
     ('Bundle-SymbolicName'): 'org.asciidoctor.asciidoctorj'
   )
+  manifest {
+    attributes(
+      'Automatic-Module-Name': 'org.asciidoctor.asciidoctorj'
+    )
+  }
   metaInf { from "$buildDir/version-info/" }
 }