diff --git a/lib/ramp-client.js b/lib/ramp-client.js
index ddf0bc0..2e32873 100644
--- a/lib/ramp-client.js
+++ b/lib/ramp-client.js
@@ -1,7 +1,7 @@
 var when_pipeline = require("when/pipeline");
 var mori = require("mori");
 var faye = require("faye");
-var uuid = require("node-uuid");
+var uuid = require("uuid");
 var rampResources = require("ramp-resources");
 var convenientHttp = require("./convenient-http");
 var sessionClient = require("./session-client");
diff --git a/lib/ramp-session.js b/lib/ramp-session.js
index 86f9631..0037f44 100644
--- a/lib/ramp-session.js
+++ b/lib/ramp-session.js
@@ -1,4 +1,4 @@
-var uuid = require("node-uuid");
+var uuid = require("uuid");
 var mori = require("mori");
 var resourceSetHelper = require("./resource-set-helper");
 
diff --git a/lib/ramp-slave.js b/lib/ramp-slave.js
index a0ebaeb..12e033e 100644
--- a/lib/ramp-slave.js
+++ b/lib/ramp-slave.js
@@ -1,4 +1,4 @@
-var uuid = require("node-uuid");
+var uuid = require("uuid");
 var mori = require("mori");
 var ejs = require("ejs");
 var fs = require("fs");
diff --git a/package.json b/package.json
index 4eadafa..d4c8c2b 100644
--- a/package.json
+++ b/package.json
@@ -13,12 +13,12 @@
     "url": "https://github.com/busterjs/ramp.git"
   },
   "dependencies": {
-    "ramp-resources": "2.x",
-    "faye": "1.1.2",
     "ejs": "2.x",
-    "node-uuid": "1.x",
-    "when": "3.x",
-    "mori": "0.3.x"
+    "faye": "1.1.2",
+    "mori": "0.3.x",
+    "ramp-resources": "2.x",
+    "uuid": "^3.0.0",
+    "when": "3.x"
   },
   "scripts": {
     "test": "node run-tests.js",