diff --git a/package.json b/package.json
index 917dbb35b21d..351c25e4f6ac 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,6 @@
     "mkdirp": "^0.5.1",
     "node-modules-path": "^1.0.0",
     "node-sass": "^3.10.1",
-    "node-uuid": "^1.4.3",
     "nopt": "^3.0.1",
     "npm-run-all": "^3.0.0",
     "offline-plugin": "^3.4.1",
@@ -124,6 +123,7 @@
     "tslint-loader": "^2.1.4",
     "typescript": "~2.0.3",
     "url-loader": "^0.5.7",
+    "uuid": "^3.0.0",
     "walk-sync": "^0.2.6",
     "webpack": "2.1.0-beta.25",
     "webpack-dev-server": "2.1.0-beta.9",
diff --git a/packages/angular-cli/ember-cli/lib/cli/index.js b/packages/angular-cli/ember-cli/lib/cli/index.js
index 6c7bdff12f37..2843a0599578 100644
--- a/packages/angular-cli/ember-cli/lib/cli/index.js
+++ b/packages/angular-cli/ember-cli/lib/cli/index.js
@@ -25,7 +25,7 @@ function clientId() {
   if (id) {
     return id;
   } else {
-    id = require('node-uuid').v4().toString();
+    id = require('uuid').v4().toString();
     configStore.set('client-id', id);
     return id;
   }
diff --git a/packages/angular-cli/package.json b/packages/angular-cli/package.json
index b31db9bbde02..289855c13d05 100644
--- a/packages/angular-cli/package.json
+++ b/packages/angular-cli/package.json
@@ -72,7 +72,6 @@
     "mkdirp": "^0.5.1",
     "node-modules-path": "^1.0.0",
     "node-sass": "^3.10.1",
-    "node-uuid": "^1.4.3",
     "nopt": "^3.0.1",
     "npm-run-all": "^3.0.0",
     "offline-plugin": "^3.4.1",
@@ -108,6 +107,7 @@
     "tslint-loader": "^2.1.4",
     "typescript": "~2.0.3",
     "url-loader": "^0.5.7",
+    "uuid": "^3.0.0",
     "walk-sync": "^0.2.6",
     "webpack": "2.1.0-beta.25",
     "webpack-dev-server": "2.1.0-beta.9",