diff --git a/changelog.html b/changelog.html
index b7974ecdea0e466bc2edb3fb5551340777acb6d3..d4a77eb0b2c578ff6548c9af4d49f9d039e2ac03 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>
+    Jenkins self-restart causes process name to change from java to exe
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-9206">issue 9206</a>)
   <li class=bug>
     Fixed a bug where SSH public key authentication for CLI wasn't working for username/password based security realm.
   <li class=rfe>
diff --git a/core/pom.xml b/core/pom.xml
index 3443376762481713adca8c24554cc1662854f7a3..b223f7108c54055c6f9a0dd2b7dcd9a6dde2a8c6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -445,9 +445,9 @@ THE SOFTWARE.
       <version>3.3.0-jenkins-2</version>
     </dependency>
     <dependency>
-      <groupId>com.sun.akuma</groupId>
+      <groupId>org.kohsuke</groupId>
       <artifactId>akuma</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
     </dependency>
     <dependency>
       <groupId>org.jvnet.libpam4j</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 01d8d704a9f55da126b9fa635371040dcd57dba6..96113b3b368fd5cabb9300490493ffe6531b6291 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -51,7 +51,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>executable-war</artifactId>
-      <version>1.20</version>
+      <version>1.24</version>
       <scope>provided</scope>
     </dependency>