diff --git a/core/pom.xml b/core/pom.xml
index 6feb9ec9970fac03d8f130f258f77dd92a4312df..9a4179653d6deeec8e7e8dd36d337668edde33a4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -755,7 +755,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>com.sun.winsw</groupId>
                   <artifactId>winsw</artifactId>
-                  <version>1.16</version>
+                  <version>2.0.2</version>
                   <classifier>bin</classifier>
                   <type>exe</type>
                   <outputDirectory>${project.build.outputDirectory}/windows-service</outputDirectory>
diff --git a/core/src/main/resources/windows-service/jenkins-slave.xml b/core/src/main/resources/windows-service/jenkins-slave.xml
deleted file mode 100644
index b4d3bf58f2092470c250b0703f75fd2b0816b3ff..0000000000000000000000000000000000000000
--- a/core/src/main/resources/windows-service/jenkins-slave.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<!--
-  Windows service definition for Jenkins slave
-
-  To uninstall, run "jenkins-slave.exe stop" to stop the service, then "jenkins-slave.exe uninstall" to uninstall the service.
-  Both commands don't produce any output if the execution is successful. 
--->
-<service>
-  <id>@ID@</id>
-  <name>Jenkins Slave</name>
-  <description>This service runs a slave for Jenkins continuous integration system.</description>
-  <!--
-    if you'd like to run Jenkins with a specific version of Java, specify a full path to java.exe.
-    The following value assumes that you have java in your PATH.
-  -->
-  <executable>@JAVA@</executable>
-  <arguments>-Xrs @VMARGS@ -jar "%BASE%\slave.jar" @ARGS@</arguments>
-  <!--
-    interactive flag causes the empty black Java window to be displayed.
-    I'm still debugging this.
-  <interactive />
-  -->
-  <logmode>rotate</logmode>
-
-  <onfailure action="restart" />
-</service>
diff --git a/core/src/main/resources/windows-service/jenkins.xml b/core/src/main/resources/windows-service/jenkins.xml
index 2bc1e79c4ec71363449c68fb964e57e486c521db..30f22a98fe9e9b3b14030dca98155ef067c69ff6 100644
--- a/core/src/main/resources/windows-service/jenkins.xml
+++ b/core/src/main/resources/windows-service/jenkins.xml
@@ -1,7 +1,7 @@
 <!--
 The MIT License
 
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+Copyright (c) 2004-2017, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oleg Nenashev, and other Jenkins contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <!--
-  Windows service definition for Jenkins
+  Windows service definition for Jenkins.
 
   To uninstall, run "jenkins.exe stop" to stop the service, then "jenkins.exe uninstall" to uninstall the service.
   Both commands don't produce any output if the execution is successful. 
@@ -31,7 +31,7 @@ THE SOFTWARE.
 <service>
   <id>jenkins</id>
   <name>Jenkins</name>
-  <description>This service runs Jenkins continuous integration system.</description>
+  <description>This service runs Jenkins automation server.</description>
   <env name="JENKINS_HOME" value="%BASE%"/>
   <!--
     if you'd like to run Jenkins with a specific version of Java, specify a full path to java.exe.
@@ -47,4 +47,23 @@ THE SOFTWARE.
   <logmode>rotate</logmode>
 
   <onfailure action="restart" />
+  
+  <!-- 
+    In the case WinSW gets terminated and leaks the process, we want to abort
+    these runaway JAR processes on startup to prevent corruption of JENKINS_HOME.
+    So this extension is enabled by default.
+  -->
+  <extensions>
+    <!-- This is a sample configuration for the RunawayProcessKiller extension. -->
+    <extension enabled="true" 
+               className="winsw.Plugins.RunawayProcessKiller.RunawayProcessKillerExtension"
+               id="killOnStartup">
+      <pidfile>%BASE%\jenkins.pid</pidfile>
+      <stopTimeout>10000</stopTimeout>
+      <stopParentFirst>false</stopParentFirst>
+    </extension>
+  </extensions>
+  
+  <!-- See the referenced examples for more options -->
+  
 </service>
diff --git a/war/pom.xml b/war/pom.xml
index 2cb82f0a9a39568506d9deff1027b8b9f4918514..c3b3e0d6997591fa85d1002611fadd44d43391c8 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -114,7 +114,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>windows-slave-installer</artifactId>
-      <version>1.6</version>
+      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>