diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index d1e1a2f650b..a041e727da2 100644
--- a/fop-core/pom.xml
+++ b/fop-core/pom.xml
@@ -357,9 +357,12 @@
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.core</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
-      </plugin>      
+      </plugin>
     </plugins>
     <resources>
       <resource>
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index a7a6d2d0e1e..15e4e994778 100644
--- a/fop-events/pom.xml
+++ b/fop-events/pom.xml
@@ -53,6 +53,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.events</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <!-- generate event collector models -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 880195c65fc..c1bc58f458f 100644
--- a/fop-sandbox/pom.xml
+++ b/fop-sandbox/pom.xml
@@ -81,6 +81,7 @@
               <mainClass>org.apache.fop.cli.Main</mainClass>
             </manifest>
             <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.sandbox</Automatic-Module-Name>
               <SpecificationTitle>XSL-FO - Extensible Stylesheet Language</SpecificationTitle>
               <SpecificationVersion>1.1</SpecificationVersion>
               <SpecificationVendor>World Wide Web Consortium</SpecificationVendor>
diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index 2ef6f7fc776..0af565a795e 100644
--- a/fop-transcoder/pom.xml
+++ b/fop-transcoder/pom.xml
@@ -58,6 +58,9 @@
                 <manifest>
                   <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                 </manifest>
+                <manifestEntries>
+                  <Automatic-Module-Name>org.apache.xmlgraphics.fop.transcoder</Automatic-Module-Name>
+                </manifestEntries>
               </archive>
               <descriptors>
                 <descriptor>src/tools/resources/assembly/assembly.xml</descriptor>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index 33fc903c3e8..109f219a78d 100644
--- a/fop-util/pom.xml
+++ b/fop-util/pom.xml
@@ -31,6 +31,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.util</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <!-- junit testing -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/fop/pom.xml b/fop/pom.xml
index 5845e1f2c49..43d68deca9b 100644
--- a/fop/pom.xml
+++ b/fop/pom.xml
@@ -52,6 +52,7 @@
               <mainClass>org.apache.fop.cli.Main</mainClass>
             </manifest>
             <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop</Automatic-Module-Name>
               <SpecificationTitle>XSL-FO - Extensible Stylesheet Language</SpecificationTitle>
               <SpecificationVersion>1.1</SpecificationVersion>
               <SpecificationVendor>World Wide Web Consortium</SpecificationVendor>
diff --git a/pom.xml b/pom.xml
index aa61f80a61c..91d95dcf950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,13 @@
   <url>http://xmlgraphics.apache.org/fop/</url>
 
   <properties>
-    <ant.version>1.9.15</ant.version>
+    <ant.version>1.10.14</ant.version>
     <antrun.plugin.version>1.8</antrun.plugin.version>
-    <batik.version>1.16.0-SNAPSHOT</batik.version>
+    <batik.version>1.17.0-SNAPSHOT</batik.version>
     <build.helper.plugin.version>1.9.1</build.helper.plugin.version>
     <checkstyle.plugin.version>2.14</checkstyle.plugin.version>
     <commons.io.version>2.11.0</commons.io.version>
-    <commons.logging.version>1.0.4</commons.logging.version>
+    <commons.logging.version>1.3.0</commons.logging.version>
     <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <exec.plugin.version>1.4.0</exec.plugin.version>
     <findbugs.plugin.version>4.2.3</findbugs.plugin.version>