diff --git a/package.json b/package.json
index 82fbace4747a..46df8fc5b3c4 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "mkdirp": "^0.5.1",
     "node-modules-path": "^1.0.0",
     "node-sass": "^3.10.1",
-    "node-uuid": "^1.4.3",
+    "uuid": "^3.0.0",
     "nopt": "^3.0.1",
     "npm-run-all": "^3.0.0",
     "offline-plugin": "^3.4.1",
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;
   }