diff --git a/batik-anim/pom.xml b/batik-anim/pom.xml
index 86aa49183c..70f545bf22 100644
--- a/batik-anim/pom.xml
+++ b/batik-anim/pom.xml
@@ -85,6 +85,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.anim</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-awt-util/pom.xml b/batik-awt-util/pom.xml
index 89eda7b91e..799bd561b9 100644
--- a/batik-awt-util/pom.xml
+++ b/batik-awt-util/pom.xml
@@ -55,6 +55,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.awt.util</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-bridge/pom.xml b/batik-bridge/pom.xml
index 348b9f2c6c..0b9076c4e3 100644
--- a/batik-bridge/pom.xml
+++ b/batik-bridge/pom.xml
@@ -111,6 +111,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.brdige</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-codec/pom.xml b/batik-codec/pom.xml
index 2f9b31004c..3e30a469d0 100644
--- a/batik-codec/pom.xml
+++ b/batik-codec/pom.xml
@@ -65,6 +65,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.codec</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-constants/pom.xml b/batik-constants/pom.xml
index f5e6283b7b..d78453e716 100644
--- a/batik-constants/pom.xml
+++ b/batik-constants/pom.xml
@@ -45,6 +45,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.constants</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-css/pom.xml b/batik-css/pom.xml
index e3a915c667..80cc547f28 100644
--- a/batik-css/pom.xml
+++ b/batik-css/pom.xml
@@ -66,6 +66,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.css</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-dom/pom.xml b/batik-dom/pom.xml
index d168be05de..d48e48fb12 100644
--- a/batik-dom/pom.xml
+++ b/batik-dom/pom.xml
@@ -75,6 +75,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.dom</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-ext/pom.xml b/batik-ext/pom.xml
index b5e61bba49..e56bb75144 100644
--- a/batik-ext/pom.xml
+++ b/batik-ext/pom.xml
@@ -45,6 +45,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.ext</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-extension/pom.xml b/batik-extension/pom.xml
index 58110281ff..87b2df1db3 100644
--- a/batik-extension/pom.xml
+++ b/batik-extension/pom.xml
@@ -100,6 +100,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.extension</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-gui-util/pom.xml b/batik-gui-util/pom.xml
index 865b308403..fd3318b4f5 100644
--- a/batik-gui-util/pom.xml
+++ b/batik-gui-util/pom.xml
@@ -74,6 +74,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.gui.util</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>      
     </plugins>
   </build>
 
diff --git a/batik-gvt/pom.xml b/batik-gvt/pom.xml
index 1bb3a50607..220b226ca0 100644
--- a/batik-gvt/pom.xml
+++ b/batik-gvt/pom.xml
@@ -55,6 +55,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.gvt</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-i18n/pom.xml b/batik-i18n/pom.xml
index 4fd1c52d6e..02720746ba 100644
--- a/batik-i18n/pom.xml
+++ b/batik-i18n/pom.xml
@@ -45,6 +45,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.i18n</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-parser/pom.xml b/batik-parser/pom.xml
index 1d69454a9e..eaf270a0f7 100644
--- a/batik-parser/pom.xml
+++ b/batik-parser/pom.xml
@@ -65,6 +65,19 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.parser</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-rasterizer/pom.xml b/batik-rasterizer/pom.xml
index 13ddfe1e77..152aee96ef 100644
--- a/batik-rasterizer/pom.xml
+++ b/batik-rasterizer/pom.xml
@@ -50,6 +50,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>${jar.version}</version>
         <configuration>
@@ -60,12 +61,14 @@
               <classpathPrefix>lib/</classpathPrefix>
             </manifest>
             <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.rasterizer</Automatic-Module-Name>
               <Class-Path>lib/fop-transcoder-allinone-${xmlgraphics.commons.version}.jar</Class-Path>
             </manifestEntries>
           </archive>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-script/pom.xml b/batik-script/pom.xml
index 48c3d05404..2647087c1a 100644
--- a/batik-script/pom.xml
+++ b/batik-script/pom.xml
@@ -67,6 +67,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${compiler.version}</version><!--$NO-MVN-MAN-VER$-->
         <configuration>
@@ -76,6 +77,19 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.script</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-slideshow/pom.xml b/batik-slideshow/pom.xml
index 26194da54f..d6cc5f52ab 100644
--- a/batik-slideshow/pom.xml
+++ b/batik-slideshow/pom.xml
@@ -60,6 +60,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>${jar.version}</version>
         <configuration>
@@ -69,10 +70,14 @@
               <addClasspath>true</addClasspath>
               <classpathPrefix>lib/</classpathPrefix>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.slideshow</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-squiggle-ext/pom.xml b/batik-squiggle-ext/pom.xml
index eaa309e780..3dbde610cc 100644
--- a/batik-squiggle-ext/pom.xml
+++ b/batik-squiggle-ext/pom.xml
@@ -55,6 +55,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>${jar.version}</version>
         <configuration>
@@ -63,10 +64,14 @@
               <mainClass>org.apache.batik.apps.svgbrowser.Main</mainClass>
               <addClasspath>true</addClasspath>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.squiggleext</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-squiggle/pom.xml b/batik-squiggle/pom.xml
index 8ec729035b..6a0a12697f 100644
--- a/batik-squiggle/pom.xml
+++ b/batik-squiggle/pom.xml
@@ -50,6 +50,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>${jar.version}</version>
         <configuration>
@@ -59,10 +60,14 @@
               <addClasspath>true</addClasspath>
               <classpathPrefix>lib/</classpathPrefix>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.squiggle</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-svg-dom/pom.xml b/batik-svg-dom/pom.xml
index 4176da327e..44a3418a00 100644
--- a/batik-svg-dom/pom.xml
+++ b/batik-svg-dom/pom.xml
@@ -80,6 +80,18 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.svgdom</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-svgbrowser/pom.xml b/batik-svgbrowser/pom.xml
index ab1655963a..cb12fd0c80 100644
--- a/batik-svgbrowser/pom.xml
+++ b/batik-svgbrowser/pom.xml
@@ -90,6 +90,18 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.svgbrowser</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-svggen/pom.xml b/batik-svggen/pom.xml
index 7a79fca773..a46923d48f 100644
--- a/batik-svggen/pom.xml
+++ b/batik-svggen/pom.xml
@@ -55,6 +55,18 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.svggen</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-svgpp/pom.xml b/batik-svgpp/pom.xml
index 702b705f03..2624e9dced 100644
--- a/batik-svgpp/pom.xml
+++ b/batik-svgpp/pom.xml
@@ -55,6 +55,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>${jar.version}</version>
         <configuration>
@@ -64,10 +65,14 @@
               <addClasspath>true</addClasspath>
               <classpathPrefix>lib/</classpathPrefix>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.svgpp</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-svgrasterizer/pom.xml b/batik-svgrasterizer/pom.xml
index 9099d13ced..0f756e6637 100644
--- a/batik-svgrasterizer/pom.xml
+++ b/batik-svgrasterizer/pom.xml
@@ -65,6 +65,18 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.svgrasterizer</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-swing/pom.xml b/batik-swing/pom.xml
index f3bab7c13d..27455f3dd7 100644
--- a/batik-swing/pom.xml
+++ b/batik-swing/pom.xml
@@ -100,6 +100,18 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.swing</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
         <executions>
diff --git a/batik-transcoder/pom.xml b/batik-transcoder/pom.xml
index fdd3ced6f0..4253a36a20 100644
--- a/batik-transcoder/pom.xml
+++ b/batik-transcoder/pom.xml
@@ -89,6 +89,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.transcoder</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
diff --git a/batik-ttf2svg/pom.xml b/batik-ttf2svg/pom.xml
index 5eb0fa4663..9aef74b57d 100644
--- a/batik-ttf2svg/pom.xml
+++ b/batik-ttf2svg/pom.xml
@@ -50,6 +50,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>${jar.version}</version>
         <configuration>
@@ -62,6 +63,17 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.ttf2svg</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
diff --git a/batik-util/pom.xml b/batik-util/pom.xml
index 661b413333..902adef4b1 100644
--- a/batik-util/pom.xml
+++ b/batik-util/pom.xml
@@ -77,18 +77,25 @@
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
         </configuration>
       </plugin>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-jar-plugin</artifactId>
-         <version>${jar.version}</version>
-         <executions>
-           <execution>
-             <goals>
-               <goal>test-jar</goal>
-             </goals>
-           </execution>
-         </executions>
-       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.util</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
diff --git a/batik-xml/pom.xml b/batik-xml/pom.xml
index 358dfa651e..405a07eac4 100644
--- a/batik-xml/pom.xml
+++ b/batik-xml/pom.xml
@@ -68,6 +68,17 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.batik.xml</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 561d4b4239..699a08ae7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <surefire.version>2.18.1</surefire.version>
     <xmlapis.version>1.4.01</xmlapis.version>
     <xmlapisext.version>1.3.04</xmlapisext.version>
-    <xmlgraphics.commons.version>2.7</xmlgraphics.commons.version>
+    <xmlgraphics.commons.version>2.9</xmlgraphics.commons.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>