diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index e9862a4c734636a01270f60bcf71aaf0bab8f267..745eff8d3f10fd355e0077cb7c7bb25c23eec36c 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -1658,6 +1658,9 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
             Executor e = (Executor) t;
             env.put("EXECUTOR_NUMBER",String.valueOf(e.getNumber()));
             env.put("NODE_NAME",e.getOwner().getName());
+            Node n = e.getOwner().getNode();
+            if (n!=null)
+                env.put("NODE_LABELS",Util.join(n.getAssignedLabels()," "));
         }
 
         return env;
diff --git a/war/resources/env-vars.html b/war/resources/env-vars.html
index 70b7d712ec64ba11cba9a3fb0961ddd4938436fc..d0269c90953659dbbf1a9773242cd3be2046b420 100644
--- a/war/resources/env-vars.html
+++ b/war/resources/env-vars.html
@@ -28,6 +28,12 @@
         carrying out this build. This is the number you see in
         the "build executor status", except that the number starts from 0, not 1.</dd>
 
+    <dt>NODE_NAME</dt>
+    <dd>Name of the slave if the build is on a slave, or "" if run on master</dd>
+
+    <dt>NODE_LABELS</dt>
+    <dd>Whitespace-separated list of labels that the node is assigned.</dd>
+
     <dt>JAVA_HOME</dt>
     <dd>If your job is configured to use a specific JDK, this variable is set to
         the JAVA_HOME of the specified JDK. When this variable is set, <tt>PATH</tt>