diff --git a/changelog.html b/changelog.html
index 6bb96981a6f2bc839e452b7d487fc19f0bb9fee7..2267bd14398089410005653457790e7f557368d9 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Fixed <tt>ArrayIndexOutOfBoundsException</tt> in XStream with Oracle JDK8 release version
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18537">issue 18537</a>)
   <li class=bug>
     Corrected permission checks for <code>copy-job</code> and <code>create-job</code> CLI commands.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22262">issue 22262</a>)
diff --git a/core/pom.xml b/core/pom.xml
index 1f49ef4c6ecb598c2b5c66c162e2fd0862ddd78d..af4f56e168b7935598fc86c9b1329ccc2f353b05 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -219,7 +219,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.4.4-jenkins-5</version>
+      <version>1.4.7-jenkins-1</version>
     </dependency>
     <dependency>
       <groupId>jfree</groupId>