diff --git a/.gitignore b/.gitignore
index a2fff6426..58f35a34b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ node_modules
 build
 release
 binaries
+source
diff --git a/.travis.yml b/.travis.yml
index bcf3307bf..a0ed2dc91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,4 +76,4 @@ deploy:
 cache:
   yarn: true
   directories:
-    - build/vscode-1.39.2-source
+    - source
diff --git a/scripts/build.ts b/scripts/build.ts
index 36a96f0f7..0fdff6e09 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -77,11 +77,10 @@ class Builder {
 		const vscodeVersion = this.ensureArgument("vscodeVersion", args[0]);
 		const codeServerVersion = this.ensureArgument("codeServerVersion", args[1]);
 
-		const stagingPath = path.join(this.outPath, "build");
-		const vscodeSourcePath = path.join(stagingPath, `vscode-${vscodeVersion}-source`);
+		const vscodeSourcePath = path.join(this.outPath, "source", `vscode-${vscodeVersion}-source`);
 		const binariesPath = path.join(this.outPath, "binaries");
 		const binaryName = `code-server${codeServerVersion}-vsc${vscodeVersion}-${target}-${arch}`;
-		const finalBuildPath = path.join(stagingPath, `${binaryName}-built`);
+		const finalBuildPath = path.join(this.outPath, "build", `${binaryName}-built`);
 
 		switch (task) {
 			case Task.Binary: