diff --git a/java/core/pom.xml b/java/core/pom.xml
index 0ec16945e2..b152d2f25a 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -144,6 +144,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
             <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
             <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
             <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index a0e0b3c7b3..0d9da14928 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -324,6 +324,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
             <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
             <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
             <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index c22ba17b11..fe10c72ef0 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -118,6 +118,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Automatic-Module-Name>com.google.protobuf.util</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
             <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
             <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName>
             <Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package>