diff --git a/build/build_linux.sh b/build/build_linux.sh
index e9a58cf..5d58466 100755
--- a/build/build_linux.sh
+++ b/build/build_linux.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 rm -rf VSCode*
-rm -rf vscode
+rm -rf vscode*
 
 ./get_repo.sh
 
diff --git a/build/build_macos.sh b/build/build_macos.sh
index 396e25a..f8392fa 100755
--- a/build/build_macos.sh
+++ b/build/build_macos.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 rm -rf VSCode*
-rm -rf vscode
+rm -rf vscode*
 
 UNAME_ARCH=$( uname -m )
 
diff --git a/build/build_windows.sh b/build/build_windows.sh
index cc8b661..f8ebc3e 100755
--- a/build/build_windows.sh
+++ b/build/build_windows.sh
@@ -3,7 +3,7 @@
 # to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build_windows.sh
 
 rm -rf VSCode*
-rm -rf vscode
+rm -rf vscode*
 rm -rf build/windows/msi/releasedir
 
 . get_repo.sh
diff --git a/patches/build-version.patch b/patches/build-version.patch
index 9c37a61..135d2bf 100644
--- a/patches/build-version.patch
+++ b/patches/build-version.patch
@@ -1,3 +1,29 @@
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index 2abc3f3..91724a5 100644
+--- a/build/gulpfile.reh.js
++++ b/build/gulpfile.reh.js
+@@ -238,7 +238,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+ 		const sources = es.merge(src, extensions, extensionsCommonDependencies)
+ 			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
+ 
+-		let version = packageJson.version;
++		let version = packageJson.version.replace('+', '.');
+ 		const quality = product.quality;
+ 
+ 		if (quality && quality !== 'stable') {
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index 28f8e52..c83a4e1 100644
+--- a/build/gulpfile.vscode.js
++++ b/build/gulpfile.vscode.js
+@@ -187,7 +187,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 		const sources = es.merge(src, extensions)
+ 			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
+ 
+-		let version = packageJson.version;
++		let version = packageJson.version.replace('+', '.');
+ 		const quality = product.quality;
+ 
+ 		if (quality && quality !== 'stable') {
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
 index 489d9cc..51db755 100644
 --- a/build/gulpfile.vscode.linux.js
@@ -116,7 +142,7 @@ index 0a5e7d2..e453393 100644
  		return false;
  	}
 diff --git a/src/vs/platform/externalServices/common/marketplace.ts b/src/vs/platform/externalServices/common/marketplace.ts
-index 5923e1c..a1c9db8 100644
+index 5923e1c..d70c59f 100644
 --- a/src/vs/platform/externalServices/common/marketplace.ts
 +++ b/src/vs/platform/externalServices/common/marketplace.ts
 @@ -13,6 +13,10 @@ import { IStorageService } from 'vs/platform/storage/common/storage';