diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 90f10ed4240f11471c0349c429d6f2457f84e1bb..a0b70de7f147ec9cdf8c94e6ad9624f7af4a874b 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -349,8 +349,6 @@ function packageTask(platform, arch, opts) {
 
 			result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
 				.pipe(rename(product.nameShort + '.VisualElementsManifest.xml')));
-
-			result = es.merge(result, gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' }));
 		} else if (platform === 'linux') {
 			result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })
 				.pipe(replace('@@NAME@@', product.applicationName))
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index a24daa47e9a02c0cf3c31c9b636ae1cde25a4a10..b8d0be611166b53c938032807a29c9c4712d75da 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -9,10 +9,12 @@ const gulp = require('gulp');
 const path = require('path');
 const assert = require('assert');
 const cp = require('child_process');
+const es = require('event-stream');
 const _7z = require('7zip')['7z'];
 const util = require('./lib/util');
 const pkg = require('../package.json');
 const product = require('../product.json');
+const vfs = require('vinyl-fs');
 
 const repoPath = path.dirname(__dirname);
 const buildPath = arch => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`);
@@ -38,8 +40,8 @@ function packageInnoSetup(iss, options, cb) {
 		.on('exit', () => cb(null));
 }
 
-function buildWin32Setup(arch) {
-	return cb => {
+function _buildWin32Setup(arch) {
+	return es.through(null, function () {
 		const ia32AppId = product.win32AppId;
 		const x64AppId = product.win32x64AppId;
 
@@ -65,7 +67,15 @@ function buildWin32Setup(arch) {
 			OutputDir: setupDir(arch)
 		};
 
-		packageInnoSetup(issPath, { definitions }, cb);
+		packageInnoSetup(issPath, { definitions }, err => err ? this.emit('error', err) : this.emit('end'));
+	});
+}
+
+function buildWin32Setup(arch) {
+	return () => {
+		return gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' })
+			.pipe(vfs.dest(buildPath))
+			.pipe(_buildWin32Setup(arch));
 	};
 }