diff --git a/build.gradle b/build.gradle
index 87384835f..771048f7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -141,6 +141,14 @@ javadoc {
     options.addBooleanOption("Xdoclint:none", true)
 }
 
+jar {
+    manifest {
+        attributes (
+            "Automatic-Module-Name": "net.sf.jsqlparser"
+        )
+    }
+}
+
 tasks.register('xmldoc', Javadoc) {
     def outFile =  reporting.file(
             version.endsWith("-SNAPSHOT")
diff --git a/pom.xml b/pom.xml
index 166924e06..f0b2c9d8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -328,6 +328,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>net.sf.jsqlparser</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.12.1</version>