diff --git a/.idea/libraries/XStream.xml b/.idea/libraries/XStream.xml
index 1ae2bba6df3e..6b84f434a446 100644
--- a/.idea/libraries/XStream.xml
+++ b/.idea/libraries/XStream.xml
@@ -1,9 +1,11 @@
 <component name="libraryTable">
   <library name="XStream">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/xstream.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/xstream-1.4.3.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/xstream-1.4.3-src.zip!/xstream-1.4.3/xstream/src/java" />
+    </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index ba54f552fc99..818aa55c8ac4 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -625,7 +625,7 @@ def layout_core_upsource(String home, String target) {
       include(name: "cli-parser-1.1.jar")
       include(name: "jna.jar")
       include(name: "log4j.jar")
-      include(name: "xstream.jar")
+      include(name: "xstream-1.4.3.jar")
       include(name: "xpp3-1.1.4-min.jar")
       include(name: "jdom.jar")
     }
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 28c3a310a364..9c17b415877f 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -231,7 +231,7 @@ libraryLicense(name: "Xerces", version: "2.9.1", license: "Apache 2.0", url: "ht
 libraryLicense(name: "XML Commons (xml-apis.jar, resolver.jar)", version: "", license: "Apache 2.0, W3C Software License , public domain", url: "http://xml.apache.org/commons/", licenseUrl: "http://xml.apache.org/commons/licenses.html")
 libraryLicense(name: "XMLBeans", libraryName: "XmlBeans", version: "2.3.0", license: "Apache 2.0", url: "http://xmlbeans.apache.org/", licenseUrl: "http://svn.jetbrains.org/idea/Trunk/bundled/WebServices/resources/lib/xmlbeans-2.3.0/xmlbeans.LICENSE")
 libraryLicense(name: "XML-RPC", libraryName: "XmlRPC", version: "2.0", license: "Apache 2.0", url: "http://ws.apache.org/xmlrpc/xmlrpc2/", licenseUrl: "http://ws.apache.org/xmlrpc/xmlrpc2/license.html")
-libraryLicense(name: "XStream", version: "1.2.1", license: "BSD", url: "http://xstream.codehaus.org/", licenseUrl: "http://xstream.codehaus.org/license.html")
+libraryLicense(name: "XStream", version: "1.4.3", license: "BSD", url: "http://xstream.codehaus.org/", licenseUrl: "http://xstream.codehaus.org/license.html")
 libraryLicense(name: "YourKit Java Profiler", libraryName: "yjp-controller-api-redist.jar", version: "8.0.x", license: "link (commercial license)", url: "http://yourkit.com/", licenseUrl: "http://www.yourkit.com/purchase/license.html")
 libraryLicense(name: "protobuf", version: "2.3.0", license: "New BSD", url: "http://code.google.com/p/protobuf/", licenseUrl: "http://code.google.com/p/protobuf/source/browse/trunk/COPYING.txt?r=367")
 libraryLicense(name: "Netty", libraryName: "Netty", version: "3.5.8", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 9ef3ea59ed7d..eda832c63687 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -43,7 +43,7 @@ xbean.jar
 xerces.jar
 xmlrpc-2.0.jar
 xpp3-1.1.4-min.jar
-xstream.jar
+xstream-1.4.3.jar
 swingx-core-1.6.2.jar
 netty-3.5.8.Final.jar
 protobuf-2.4.1.jar
diff --git a/lib/src/xstream-1.4.3-src.zip b/lib/src/xstream-1.4.3-src.zip
new file mode 100644
index 000000000000..7a9e93a1761a
Binary files /dev/null and b/lib/src/xstream-1.4.3-src.zip differ
diff --git a/lib/xstream-1.4.3.jar b/lib/xstream-1.4.3.jar
new file mode 100644
index 000000000000..815ed039b3a1
Binary files /dev/null and b/lib/xstream-1.4.3.jar differ
diff --git a/lib/xstream.jar b/lib/xstream.jar
deleted file mode 100644
index e43240a50219..000000000000
Binary files a/lib/xstream.jar and /dev/null differ