diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 9f5bb63c72f8cb3ea03d0d20b4ef755fd17737de..e7aebb77d297371ac9e0c26cb7898d20fcdb231a 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -619,6 +619,9 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
         super.renameTo(newName);
         File newBuildDir = getBuildDir();
         if (oldBuildDir.isDirectory() && !newBuildDir.isDirectory()) {
+            if (!newBuildDir.getParentFile().isDirectory()) {
+                newBuildDir.getParentFile().mkdirs();
+            }
             if (!oldBuildDir.renameTo(newBuildDir)) {
                 throw new IOException("failed to rename " + oldBuildDir + " to " + newBuildDir);
             }
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index ad1903e8c6d5c96a84dd6b7d3a2f305270bed84e..53f98ecfe252bd044870a6fff0c7dfab2261357e 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -2014,6 +2014,11 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         return buildsDir;
     }
 
+    @Restricted(NoExternalUse.class)
+    public void setRawBuildsDir(String buildsDir) {
+        this.buildsDir = buildsDir;
+    }
+
     public FilePath getRootPath() {
         return new FilePath(getRootDir());
     }
diff --git a/test/src/test/java/hudson/model/JobTest.java b/test/src/test/java/hudson/model/JobTest.java
index 02f38a37d5c6bbdfd6053f3261e1616aa1de0653..2d3d7e7b904647e2b4b64679a5e83f634d6affe8 100644
--- a/test/src/test/java/hudson/model/JobTest.java
+++ b/test/src/test/java/hudson/model/JobTest.java
@@ -277,4 +277,12 @@ public class JobTest {
         }).intValue());
     }
 
+    @Bug(19764)
+    @Test public void testRenameWithCustomBuildsDirWithSubdir() throws Exception {
+        j.jenkins.setRawBuildsDir("${JENKINS_HOME}/builds/${ITEM_FULL_NAME}/builds");
+        final FreeStyleProject p = j.createFreeStyleProject();
+        p.scheduleBuild2(0).get();
+        p.renameTo("different-name");
+    }
+
 }