diff --git a/core/src/main/resources/hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly b/core/src/main/resources/hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly
index 1dae02b2b749d9f7f16b7061f3e23729c24bd017..c68ed0c3f462f368ee091477f8099e6a06c6ca37 100644
--- a/core/src/main/resources/hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly
+++ b/core/src/main/resources/hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly
@@ -23,7 +23,15 @@
       </security>
 
       <resources>
-        <j2se version="1.5+"/>
+        <j:set var="port" value="${request.getParameter('debugPort')}"/>
+        <j:choose>
+          <j:when test="${port!=null}">
+            <j2se version="1.5+" java-vm-args="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=${port}" />
+          </j:when>
+          <j:otherwise>
+            <j2se version="1.5+" />
+          </j:otherwise>
+        </j:choose>
         <jar href="jnlpJars/jnlp-agent.jar"/>
         <jar href="jnlpJars/remoting.jar"/>
       </resources>