diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index 36d6aa20639e21f825ed3cb4d3ca558ba7637334..3b9762d6525a591fb78ebc5543adf7bfaaad95de 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -255,7 +255,7 @@ public abstract class Slave extends Node implements Serializable {
     public FilePath getWorkspaceRoot() {
         FilePath r = getRootPath();
         if(r==null) return null;
-        return r.child("workspace");
+        return r.child(WORKSPACE_ROOT);
     }
 
     /**
@@ -414,4 +414,9 @@ public abstract class Slave extends Node implements Serializable {
 
         private static final long serialVersionUID = 1L;
     }
+
+    /**
+     * Determines the workspace root file name for those who really really need the shortest possible path name.
+     */
+    private static final String WORKSPACE_ROOT = System.getProperty(Slave.class.getName()+".workspaceRoot","workspace");
 }