diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 663de31dd6..3ce3e03883 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -1874,7 +1874,7 @@ public class Functions {
     /**
      * Obtains the host name of the Hudson server that clients can use to talk back to.
      * <p>
-     * This is primarily used in {@code slave-agent.jnlp.jelly} to specify the destination
+     * This is primarily used in {@code jenkins-agent.jnlp.jelly} to specify the destination
      * that the agents talk to.
      */
     public String getServerName() {
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index eff15c5dd1..9d79829343 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -814,13 +814,24 @@ public class SlaveComputer extends Computer {
 
     @WebMethod(name="slave-agent.jnlp")
     public HttpResponse doSlaveAgentJnlp(StaplerRequest req, StaplerResponse res) {
-        return new EncryptedSlaveAgentJnlpFile(this, "slave-agent.jnlp.jelly", getName(), CONNECT);
+
+        return doJenkinsAgentJnlp(req, res);
+    }
+
+    @WebMethod(name="jenkins-agent.jnlp")
+    public HttpResponse doJenkinsAgentJnlp(StaplerRequest req, StaplerResponse res) {
+        return new EncryptedSlaveAgentJnlpFile(this, "jenkins-agent.jnlp.jelly", getName(), CONNECT);
     }
 
     class LowPermissionResponse {
+        @WebMethod(name="jenkins-agent.jnlp")
+        public HttpResponse doJenkinsAgentJnlp(StaplerRequest req, StaplerResponse res) {
+            return SlaveComputer.this.doJenkinsAgentJnlp(req, res);
+        }
+
         @WebMethod(name="slave-agent.jnlp")
         public HttpResponse doSlaveAgentJnlp(StaplerRequest req, StaplerResponse res) {
-            return SlaveComputer.this.doSlaveAgentJnlp(req, res);
+            return SlaveComputer.this.doJenkinsAgentJnlp(req, res);
         }
     }
 
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 8cdfaa0cf7..9286a93bd4 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -4820,7 +4820,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         }
 
         // TODO SlaveComputer.doSlaveAgentJnlp; there should be an annotation to request unprotected access
-        if (restOfPath.matches("/computer/[^/]+/slave-agent[.]jnlp")
+        if ((isAgentJnlpPath(restOfPath, "jenkins") || (isAgentJnlpPath(restOfPath, "slave")))
             && "true".equals(Stapler.getCurrentRequest().getParameter("encrypt"))) {
             return false;
         }
@@ -4828,6 +4828,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         return true;
     }
 
+    private boolean isAgentJnlpPath(String restOfPath, String prefix) {
+        return restOfPath.matches("/computer/[^/]+/" + prefix+ "-agent[.]jnlp");
+    }
+
     /**
      * Gets a list of unprotected root actions.
      * These URL prefixes should be exempted from access control checks by container-managed security.
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
index 404e30b9f0..3cade5dd6a 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
@@ -41,7 +41,7 @@ THE SOFTWARE.
             <j:when test="${it.launcher.javaWebStartSupported}">
               <li>
                 <p>
-                  <a href="slave-agent.jnlp" id="jnlp-link">
+                  <a href="jenkins-agent.jnlp" id="jnlp-link">
                     <img src="${imagesURL}/webstart.gif" alt="${%launch agent}" />
                   </a>
                   ${%Launch agent from browser}
@@ -64,13 +64,13 @@ THE SOFTWARE.
                 <p>
                   ${%Run from agent command line:}
                 </p>
-                <pre>javaws ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
+                <pre>javaws ${h.inferHudsonURL(request)}${it.url}jenkins-agent.jnlp</pre>
               </li>
               <li>
                 <p>
                   ${%Or if the agent is headless:}
                 </p>
-                <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp ${it.launcher.getWorkDirOptions(it)}</pre>
+                <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}jenkins-agent.jnlp ${it.launcher.getWorkDirOptions(it)}</pre>
               </li>
             </j:when>
             <j:otherwise>
@@ -79,12 +79,12 @@ THE SOFTWARE.
                   ${%Run from agent command line:}
                 </p>
                 <!-- TODO conceal secret w/ JS if possible -->
-                <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret ${it.jnlpMac} ${it.launcher.getWorkDirOptions(it)}</pre>
+                <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}jenkins-agent.jnlp -secret ${it.jnlpMac} ${it.launcher.getWorkDirOptions(it)}</pre>
                 <p>
                   ${%Run from agent command line, with the secret stored in a file:}
                 </p>
                 <pre>echo ${it.jnlpMac} > secret-file
-java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret @secret-file ${it.launcher.getWorkDirOptions(it)}</pre>
+java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}jenkins-agent.jnlp -secret @secret-file ${it.launcher.getWorkDirOptions(it)}</pre>
               </li>
             </j:otherwise>
           </j:choose>
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/jenkins-agent.jnlp.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/jenkins-agent.jnlp.jelly
new file mode 100644
index 0000000000..6e4dcc41ff
--- /dev/null
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/jenkins-agent.jnlp.jelly
@@ -0,0 +1,95 @@
+<!--
+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.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
+  <l:view contentType="application/x-java-jnlp-file">
+  <j:set var="rootURL" value="${app.rootUrl}" />
+
+  <!--
+    See http://www.dallaway.com/acad/webstart/ for obtaining the certificate.
+  -->
+
+    <!-- See http://java.sun.com/j2se/1.5.0/docs/guide/javaws/developersguide/syntax.html for the syntax -->
+    <jnlp spec="1.0+"
+        codebase="${rootURL}computer/${h.encode(it.node.nodeName)}/">
+
+      <information>
+        <title>Agent for ${it.displayName}</title>
+        <vendor>Jenkins project</vendor>
+        <homepage href="https://jenkins-ci.org/"/>
+      </information>
+
+      <security>
+        <all-permissions/>
+      </security>
+
+      <j:set var="launcher" value="${it.delegatedLauncher}"/>
+
+      <resources>
+        <j:set var="port" value="${request.getParameter('debugPort')}"/>
+        <j:choose>
+          <j:when test="${port!=null}">
+            <j2se version="1.8+" java-vm-args="${launcher.vmargs} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=${port}" />
+          </j:when>
+          <j:otherwise>
+            <j2se version="1.8+" java-vm-args="${launcher.vmargs}"/>
+          </j:otherwise>
+        </j:choose>
+        <jar href="${rootURL}jnlpJars/remoting.jar"/>
+      </resources>
+
+      <application-desc main-class="hudson.remoting.jnlp.Main">
+        <argument>${it.jnlpMac}</argument>
+        <argument>${it.node.nodeName}</argument>
+        <j:if test="${launcher.webSocket}">
+          <argument>-webSocket</argument>
+        </j:if>
+        <j:if test="${launcher.tunnel!=null}">
+          <argument>-tunnel</argument>
+          <argument>${launcher.tunnel}</argument>
+        </j:if>
+        <j:if test="${not launcher.workDirSettings.disabled}">
+          <argument>-workDir</argument>
+          <j:choose>
+            <j:when test="${launcher.workDirSettings.useAgentRootDir}">
+              <argument>${it.node.remoteFS}</argument>
+            </j:when>
+            <j:otherwise>
+              <argument>${launcher.workDirSettings.workDirPath}</argument>
+            </j:otherwise>
+          </j:choose>
+          <argument>-internalDir</argument>
+          <argument>${launcher.workDirSettings.internalDir}</argument>
+          <j:if test="${launcher.workDirSettings.failIfWorkDirIsMissing}">
+            <argument>-failIfWorkDirIsMissing</argument>
+          </j:if>
+        </j:if>
+
+        <argument>-url</argument>
+        <argument>${rootURL}</argument>
+      </application-desc>
+    </jnlp>
+  </l:view>
+</j:jelly>