diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index ed9c007d23..44ebc0d164 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -173,7 +173,7 @@ final String OOXML_LITE_REPORT = '../src/resources/ooxml-lite-report'
 final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)"
 
 compileJava {
-    dependsOn 'fixBatik'
+    dependsOn 'fixBatik', 'cleanupBatik'
 }
 
 task compileJava9(type: JavaCompile) {
@@ -278,6 +278,14 @@ task fixBatik(type: Zip) {
     }
 }
 
+task cleanupBatik(type: Delete) {
+    // remove older files to avoid build failures because of duplicate modules
+    delete fileTree("${buildDir}/brokenJars/").matching {
+        include "*.jar"
+        exclude "batik*-${batikVersion}.jar"
+    }
+}
+
 javadoc {
     failOnError = true
     doFirst {