diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 803e642c1f77..da1fbd1fd875 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -968,9 +968,9 @@ def layout_core(String home, String target) {
       include(name: "snappy-in-java-0.3.1.jar")
       include(name: "jayatana-1.2.4.jar")
       include(name: "imgscalr-lib-4.2.jar")
-      include(name: "batik-all-1.8.jar")
+      include(name: "batik-all.jar")
       include(name: "xmlgraphics-commons-1.5.jar")
-      include(name: "xml-apis-ext-1.3.04.jar")
+      include(name: "xml-apis-ext.jar")
     }
   }
 }
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 38379946326a..4a2fea25f1f8 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -211,9 +211,9 @@ libraryLicense(name: "Guava", version: "17.0", license: "Apache 2.0", url: "http
 libraryLicense(name: "hamcrest", version: "1.3", license: "BSD", url: "http://hamcrest.org/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
 libraryLicense(name: "HttpComponents HttpClient", libraryName: "http-client", version: "4.3.2", license: "Apache 2.0", url: "http://hc.apache.org/httpcomponents-client-ga/index.html")
 libraryLicense(name: "imgscalr", libraryName: "imgscalr", version: "4.2", license: "Apache 2.0", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/thebuzzmedia/imgscalr")
-libraryLicense(name: "batik", libraryName: "batik", version: "1.8", license: "Apache 2.0", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://svn.apache.org/repos/asf/xmlgraphics/batik")
+libraryLicense(name: "batik", libraryName: "batik", version: "1.7.1", license: "Apache 2.0", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://svn.apache.org/repos/asf/xmlgraphics/batik")
 libraryLicense(name: "xmlgraphics-commons", libraryName: "xmlgraphics-commons", version: "1.5", license: "Apache 2.0", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://svn.apache.org/repos/asf/xmlgraphics/commons")
-libraryLicense(name: "xml-apis-ext", libraryName: "xml-apis-ext", version: "1.3.04", license: "Apache 2.0", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "http://xerces.apache.org/xml-commons/components/external")
+libraryLicense(name: "xml-apis-ext", libraryName: "xml-apis-ext", version: "1.3", license: "Apache 2.0", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "http://xerces.apache.org/xml-commons/components/external")
 libraryLicense(name: "ini4j", libraryName: "ini4j-0.5.2-patched", version: "0.5.2 (with a patch by JetBrains)", license: "Apache 2.0", url: "http://ini4j.sourceforge.net/", attachedTo: "git4idea")
 libraryLicense(name: "ISO RELAX", libraryName: "isorelax.jar", license: "MIT License", url: "http://sourceforge.net/projects/iso-relax/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "Jakarta ORO", libraryName: "OroMatcher", version: "2.0.8", license: "Apache", url: "http://jakarta.apache.org/oro/", licenseUrl: "http://svn.apache.org/repos/asf/jakarta/oro/trunk/LICENSE")
diff --git a/lib/batik-all-1.8.jar b/lib/batik-all.jar
similarity index 63%
rename from lib/batik-all-1.8.jar
rename to lib/batik-all.jar
index 1a77176e4441..b6ef190b07a9 100644
Binary files a/lib/batik-all-1.8.jar and b/lib/batik-all.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index d9e9995a2f8b..668b5a11057f 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -22,9 +22,9 @@ gson-2.3.1.jar
 guava-17.0.jar
 hamcrest-core-1.3.jar
 imgscalr-lib-4.2.jar
-batik-all-1.8.jar
+batik-all.jar
 xmlgraphics-commons-1.5.jar
-xml-apis-ext-1.3.04.jar
+xml-apis-ext.jar
 jaxen-1.1.3.jar
 jayatana-1.2.4.jar
 jcip-annotations.jar
diff --git a/lib/xml-apis-ext-1.3.04.jar b/lib/xml-apis-ext.jar
old mode 100755
new mode 100644
similarity index 100%
rename from lib/xml-apis-ext-1.3.04.jar
rename to lib/xml-apis-ext.jar
diff --git a/platform/util/src/com/intellij/util/SVGLoader.java b/platform/util/src/com/intellij/util/SVGLoader.java
index 7a9cd884810d..b620d4ac7207 100644
--- a/platform/util/src/com/intellij/util/SVGLoader.java
+++ b/platform/util/src/com/intellij/util/SVGLoader.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.util;
 
-import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
 import org.apache.batik.transcoder.TranscoderException;
 import org.apache.batik.transcoder.TranscoderInput;
 import org.apache.batik.transcoder.TranscoderOutput;
diff --git a/platform/util/util.iml b/platform/util/util.iml
index 1bfb29f1b2b9..a456762929b0 100644
--- a/platform/util/util.iml
+++ b/platform/util/util.iml
@@ -23,6 +23,7 @@
     <orderEntry type="library" name="imgscalr" level="project" />
     <orderEntry type="library" name="batik" level="project" />
     <orderEntry type="library" name="xmlgraphics-commons" level="project" />
+    <orderEntry type="library" name="xml-apis-ext" level="project" />
   </component>
   <component name="copyright">
     <Base>