diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 931191d8cbf..738afa260e3 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -310,7 +310,7 @@ function packageTask(platform, arch, opts) {
 		const deps = gulp.src(depsSrc, { base: '.', dot: true })
 			.pipe(filter(['**', '!**/package-lock.json']))
 			.pipe(util.cleanNodeModule('fsevents', ['binding.gyp', 'fsevents.cc', 'build/**', 'src/**', 'test/**'], ['**/*.node']))
-			.pipe(util.cleanNodeModule('sqlite3', ['binding.gyp', 'benchmark/**', 'cloudformation/**', 'deps/**', 'test/**', 'build/**', 'src/**'], ['**/*.node']))
+			.pipe(util.cleanNodeModule('vscode-sqlite3', ['binding.gyp', 'benchmark/**', 'cloudformation/**', 'deps/**', 'test/**', 'build/**', 'src/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('oniguruma', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/*.js']))
 			.pipe(util.cleanNodeModule('windows-mutex', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
diff --git a/package.json b/package.json
index 84cc70b97fe..0f438ea3e20 100644
--- a/package.json
+++ b/package.json
@@ -44,12 +44,12 @@
     "semver": "^5.5.0",
     "spdlog": "0.7.2",
     "sudo-prompt": "8.2.0",
-    "sqlite3": "bpasero/node-sqlite3#vscode",
     "v8-inspect-profiler": "^0.0.8",
     "vscode-chokidar": "1.6.4",
     "vscode-debugprotocol": "1.32.0",
     "vscode-nsfw": "1.0.17",
     "vscode-ripgrep": "^1.2.2",
+    "vscode-sqlite3": "4.0.2",
     "vscode-textmate": "^4.0.1",
     "vscode-xterm": "3.9.0-beta7",
     "winreg": "^1.2.4",
diff --git a/src/typings/sqlite3.d.ts b/src/typings/vscode-sqlite3.d.ts
similarity index 99%
rename from src/typings/sqlite3.d.ts
rename to src/typings/vscode-sqlite3.d.ts
index 4aa3b301ed3..4363d251c46 100644
--- a/src/typings/sqlite3.d.ts
+++ b/src/typings/vscode-sqlite3.d.ts
@@ -12,7 +12,7 @@
 
 /// <reference types="node" />
 
-declare module 'sqlite3' {
+declare module 'vscode-sqlite3' {
 	import events = require("events");
 
 	export const OPEN_READONLY: number;
diff --git a/src/vs/base/node/storage.ts b/src/vs/base/node/storage.ts
index d0ff78aaf68..96c85fb0d53 100644
--- a/src/vs/base/node/storage.ts
+++ b/src/vs/base/node/storage.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Database, Statement } from 'sqlite3';
+import { Database, Statement } from 'vscode-sqlite3';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Emitter, Event } from 'vs/base/common/event';
 import { RunOnceScheduler } from 'vs/base/common/async';
@@ -291,7 +291,7 @@ export class SQLiteStorageImpl {
 
 	private doOpen(path: string): Promise<Database> {
 		return new Promise((resolve, reject) => {
-			import('sqlite3').then(sqlite3 => {
+			import('vscode-sqlite3').then(sqlite3 => {
 				const db = new (this.logger.verbose ? sqlite3.verbose().Database : sqlite3.Database)(path, error => {
 					if (error) {
 						return reject(error);
diff --git a/yarn.lock b/yarn.lock
index e70d99fb8d2..ace5d89692f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8132,12 +8132,6 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sqlite3@bpasero/node-sqlite3#vscode:
-  version "4.0.2"
-  resolved "https://codeload.github.com/bpasero/node-sqlite3/tar.gz/5e89b68e6979c09cc46313ade84046f391edceda"
-  dependencies:
-    nan "~2.10.0"
-
 sshpk@^1.7.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
@@ -9350,6 +9344,13 @@ vscode-ripgrep@^1.2.2:
   resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.2.2.tgz#c21b91bb558638a7124fe3d9719b2666b12dbfdc"
   integrity sha512-rPbCj4LUnPzivezk3pC94G5sB17HbayjV9mSvNTDYFg5llHN/XozAmkoDOC0KG9UveuQ71MADX1//CeHtUTmZw==
 
+vscode-sqlite3@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-sqlite3/-/vscode-sqlite3-4.0.2.tgz#35389b7ee973f7ba6a8e57cbbdde1608ffc6d60c"
+  integrity sha512-QuXKvwtkjsQgIlU2mDhkp+pNIpwKY99MNwE4PJTOFkck7dtfwnYQwLvuuJ666a2QMDMqCEKYHG5+0bhrGh+gZg==
+  dependencies:
+    nan "~2.10.0"
+
 vscode-textmate@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.0.1.tgz#6c36f28e9059ce12bc34907f7a33ea43166b26a8"