diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index e65f51d5c6a..b000df8c87a 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -31,8 +31,9 @@ const shrinkwrap = require('../npm-shrinkwrap.json');
 const crypto = require('crypto');
 const i18n = require('./lib/i18n');
 
+const productDependencies = Object.keys(product.dependencies || {});
 const dependencies = Object.keys(shrinkwrap.dependencies)
-	.concat(Array.isArray(product.extraNodeModules) ? product.extraNodeModules : []); // additional dependencies from our product configuration
+	.concat(productDependencies); // additional dependencies from our product configuration
 const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
 const nodeModules = ['electron', 'original-fs']
 	.concat(dependencies)
@@ -273,7 +274,8 @@ function packageTask(platform, arch, opts) {
 			.pipe(util.cleanNodeModule('windows-foreground-love', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
 			.pipe(util.cleanNodeModule('v8-profiler', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
-			.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'tools/**'], ['build/Release/**']));
+			.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'tools/**'], ['build/Release/**']))
+			.pipe(util.cleanNodeModule('vsda', ['**'], ['package.json', 'index.js', '**/*.node']));
 
 		let all = es.merge(
 			packageJsonStream,
@@ -363,7 +365,7 @@ const apiHostname = process.env.TRANSIFEX_API_URL;
 const apiName = process.env.TRANSIFEX_API_NAME;
 const apiToken = process.env.TRANSIFEX_API_TOKEN;
 
-gulp.task('vscode-translations-push', ['optimize-vscode'], function() {
+gulp.task('vscode-translations-push', ['optimize-vscode'], function () {
 	const pathToMetadata = './out-vscode/nls.metadata.json';
 	const pathToExtensions = './extensions/**/*.nls.json';
 	const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
@@ -375,7 +377,7 @@ gulp.task('vscode-translations-push', ['optimize-vscode'], function() {
 	).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
 });
 
-gulp.task('vscode-translations-pull', function() {
+gulp.task('vscode-translations-pull', function () {
 	return es.merge(
 		i18n.pullXlfFiles('vscode-editor', apiHostname, apiName, apiToken, vscodeLanguages),
 		i18n.pullXlfFiles('vscode-workbench', apiHostname, apiName, apiToken, vscodeLanguages),
@@ -384,7 +386,7 @@ gulp.task('vscode-translations-pull', function() {
 	).pipe(vfs.dest('../vscode-localization'));
 });
 
-gulp.task('vscode-translations-import', function() {
+gulp.task('vscode-translations-import', function () {
 	return gulp.src('../vscode-localization/**/*.xlf').pipe(i18n.prepareJsonFiles()).pipe(vfs.dest('./i18n'));
 });
 
diff --git a/build/tfs/common/installDistro.ts b/build/tfs/common/installDistro.ts
new file mode 100644
index 00000000000..fddc7b88a09
--- /dev/null
+++ b/build/tfs/common/installDistro.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const cp = require('child_process');
+const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+
+function npmInstall(package: string): void {
+	const result = cp.spawnSync(npm, ['install', package], {
+		stdio: 'inherit'
+	});
+
+	if (result.error || result.status !== 0) {
+		process.exit(1);
+	}
+}
+
+const product = require('../../../product.json');
+const dependencies = product.dependencies || {} as { [name: string]: string; };
+
+Object.keys(dependencies).forEach(name => {
+	const url = dependencies[name];
+	npmInstall(url);
+});
\ No newline at end of file
diff --git a/build/tfs/darwin/build.sh b/build/tfs/darwin/build.sh
index c71342fd42c..7236231655d 100755
--- a/build/tfs/darwin/build.sh
+++ b/build/tfs/darwin/build.sh
@@ -6,6 +6,13 @@ export AZURE_STORAGE_ACCESS_KEY="$2"
 export AZURE_STORAGE_ACCESS_KEY_2="$3"
 export MOONCAKE_STORAGE_ACCESS_KEY="$4"
 export AZURE_DOCUMENTDB_MASTERKEY="$5"
+VSO_PAT="$6"
+
+# Create a .netrc file to download distro dependencies
+cat > ~/.netrc <<END
+machine monacotools.visualstudio.com
+	password $VSO_PAT
+END
 
 # set agent specific npm cache
 if [ -n "$AGENT_WORKFOLDER" ]
@@ -26,6 +33,9 @@ STEP() {
 STEP "Install dependencies"
 ./scripts/npm.sh install
 
+STEP "Install distro dependencies"
+npm run install-distro
+
 STEP "Mix in repository from vscode-distro"
 npm run gulp -- mixin
 
diff --git a/build/tfs/linux/build.sh b/build/tfs/linux/build.sh
index de574f521e8..cdf4add3107 100755
--- a/build/tfs/linux/build.sh
+++ b/build/tfs/linux/build.sh
@@ -8,6 +8,13 @@ export AZURE_STORAGE_ACCESS_KEY_2="$4"
 export MOONCAKE_STORAGE_ACCESS_KEY="$5"
 export AZURE_DOCUMENTDB_MASTERKEY="$6"
 export LINUX_REPO_PASSWORD="$7"
+VSO_PAT="$8"
+
+# Create a .netrc file to download distro dependencies
+cat > ~/.netrc <<END
+machine monacotools.visualstudio.com
+	password $VSO_PAT
+END
 
 # set agent specific npm cache
 if [ -n "$AGENT_WORKFOLDER" ]
@@ -31,6 +38,9 @@ STEP "Install dependencies"
 STEP "Mix in repository from vscode-distro"
 npm run gulp -- mixin
 
+STEP "Install distro dependencies"
+npm run install-distro
+
 STEP "Build minified"
 npm run gulp -- --max_old_space_size=4096 "vscode-linux-$ARCH-min"
 
diff --git a/build/tfs/win32/1_build.ps1 b/build/tfs/win32/1_build.ps1
index 5a4f5dcba4b..d78e1e7131b 100644
--- a/build/tfs/win32/1_build.ps1
+++ b/build/tfs/win32/1_build.ps1
@@ -1,9 +1,19 @@
 Param(
-   [string]$mixinPassword
+   [string]$mixinPassword,
+   [string]$vsoPAT
 )
 
 . .\build\tfs\win32\lib.ps1
 
+# In order to get _netrc to work, we need a HOME variable setup
+$env:HOME=$env:USERPROFILE
+
+# Create a _netrc file to download distro dependencies
+@"
+machine monacotools.visualstudio.com
+password ${vsoPAT}
+"@ | Out-File ~/_netrc -Encoding ASCII
+
 STEP "Install dependencies"
 exec { & .\scripts\npm.bat install }
 
@@ -11,6 +21,9 @@ STEP "Mix in repository from vscode-distro"
 $env:VSCODE_MIXIN_PASSWORD = $mixinPassword
 exec { & npm run gulp -- mixin }
 
+STEP "Install distro dependencies"
+exec { & npm run install-distro }
+
 STEP "Build minified"
 exec { & npm run gulp -- --max_old_space_size=4096 vscode-win32-min }
 
diff --git a/package.json b/package.json
index 80d6acf5c85..b22df3cc3ee 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "code-oss-dev",
   "version": "1.13.0",
   "electronVersion": "1.6.6",
-  "distro": "f47ad59ab4e6bfa34219867471d8b282a2cde33b",
+  "distro": "a08520285a5d8cb174da73cbec07cc7aff0cee3b",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -18,7 +18,8 @@
     "monaco-editor-test": "mocha --only-monaco-editor",
     "precommit": "node build/gulpfile.hygiene.js",
     "gulp": "gulp",
-    "7z": "7z"
+    "7z": "7z",
+    "install-distro": "node build/tfs/common/installDistro.js"
   },
   "dependencies": {
     "applicationinsights": "0.17.1",
diff --git a/src/vs/platform/node/product.ts b/src/vs/platform/node/product.ts
index 7b30b0bb2f9..4937ade6d77 100644
--- a/src/vs/platform/node/product.ts
+++ b/src/vs/platform/node/product.ts
@@ -52,7 +52,6 @@ export interface IProductConfiguration {
 	npsSurveyUrl: string;
 	checksums: { [path: string]: string; };
 	checksumFailMoreInfoUrl: string;
-	extraNodeModules: string[];
 }
 
 const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);