diff --git a/changelog.html b/changelog.html
index 21106fbacdfc936dee1665043390a7caab60a8ff..5a721ec994c983cb607ed7081836981d3ecf15e3 100644
--- a/changelog.html
+++ b/changelog.html
@@ -75,6 +75,8 @@ Upcoming changes
(issue 15408)
Failure to initialie the SSH daemon shouldn't fail the boot.
+
+ Added new GUI-based slave installer for upstart
diff --git a/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java b/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java
index 09c5da284ef5f0103bf208f1472da98585ee9c4d..9a92824bc0cd39dbeb200116b050367542eff87e 100644
--- a/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java
+++ b/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java
@@ -57,6 +57,9 @@ import static javax.swing.JOptionPane.*;
/**
* @author Kohsuke Kawaguchi
+ * @deprecated as of 1.491
+ * The functionality is moved to windows-slave-installer-module to support
+ * multiple platforms uniformly.
*/
public class WindowsSlaveInstaller implements Callable, ActionListener {
/**
diff --git a/core/src/main/java/hudson/os/SU.java b/core/src/main/java/hudson/os/SU.java
index 4bd33957f5dc249b75f17827e29a51cf77c0926f..b254f54c4305a9c4d3b325799cda3981140a2a9b 100644
--- a/core/src/main/java/hudson/os/SU.java
+++ b/core/src/main/java/hudson/os/SU.java
@@ -62,6 +62,8 @@ public abstract class SU {
/**
* Returns a {@link VirtualChannel} that's connected to the priviledge-escalated environment.
*
+ * @param listener
+ * What this method is doing (such as what process it's invoking) will be sent here.
* @return
* Never null. This may represent a channel to a separate JVM, or just {@link LocalChannel}.
* Close this channel and the SU environment will be shut down.
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index fa16b13518f2051d12320a5b79eb3233dfda8e64..05311ba5f407619089a0e16fa9494e45640da674 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -365,7 +365,7 @@ public class SlaveComputer extends Computer {
channel.pinClassLoader(getClass().getClassLoader());
channel.call(new SlaveInitializer());
- channel.call(new WindowsSlaveInstaller(remoteFs));
+// channel.call(new WindowsSlaveInstaller(remoteFs));
for (ComputerListener cl : ComputerListener.all())
cl.preOnline(this,channel,root,taskListener);
diff --git a/war/pom.xml b/war/pom.xml
index 55fd5fa1c6b39c12d25c2c5eef9a1b782f7be5d1..f32bd3ae6553677a44983fe45b5a4220600073f5 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -117,9 +117,19 @@ THE SOFTWARE.
ssh-cli-auth
1.2
+
+ org.jenkins-ci.modules
+ windows-slave-installer
+ 1.0
+
org.jenkins-ci.modules
launchd-slave-installer
+ 1.1
+
+
+ org.jenkins-ci.modules
+ upstart-slave-installer
1.0