diff --git a/core/server/data/import/index.js b/core/server/data/import/index.js
index 072f08f328..a63fca0fac 100644
--- a/core/server/data/import/index.js
+++ b/core/server/data/import/index.js
@@ -2,7 +2,7 @@ var Promise         = require('bluebird'),
     _               = require('lodash'),
     validation      = require('../validation'),
     errors          = require('../../errors'),
-    uuid            = require('node-uuid'),
+    uuid            = require('uuid'),
     importer        = require('./data-importer'),
     tables          = require('../schema').tables,
     i18n            = require('../../i18n'),
diff --git a/core/server/data/importer/index.js b/core/server/data/importer/index.js
index a4c4816715..dcdc9b1986 100644
--- a/core/server/data/importer/index.js
+++ b/core/server/data/importer/index.js
@@ -6,7 +6,7 @@ var _            = require('lodash'),
     path         = require('path'),
     os           = require('os'),
     glob         = require('glob'),
-    uuid         = require('node-uuid'),
+    uuid         = require('uuid'),
     extract      = require('extract-zip-fork'),
     errors       = require('../../errors'),
     logging      = require('../../logging'),
diff --git a/core/server/errors.js b/core/server/errors.js
index be3d037ad9..0b76daa703 100644
--- a/core/server/errors.js
+++ b/core/server/errors.js
@@ -1,5 +1,5 @@
 var _ = require('lodash'),
-    uuid = require('node-uuid'),
+    uuid = require('uuid'),
     util = require('util');
 
 function GhostError(options) {
diff --git a/core/server/index.js b/core/server/index.js
index fb0f633142..f09d4806ca 100644
--- a/core/server/index.js
+++ b/core/server/index.js
@@ -14,7 +14,7 @@ require('./overrides');
 
 // Module dependencies
 var debug = require('debug')('ghost:boot:init'),
-    uuid = require('node-uuid'),
+    uuid = require('uuid'),
     Promise = require('bluebird'),
     KnexMigrator = require('knex-migrator'),
     config = require('./config'),
diff --git a/core/server/middleware/log-request.js b/core/server/middleware/log-request.js
index 852fa3822c..f1ae1cf3d7 100644
--- a/core/server/middleware/log-request.js
+++ b/core/server/middleware/log-request.js
@@ -1,4 +1,4 @@
-var uuid = require('node-uuid'),
+var uuid = require('uuid'),
     logging = require('../logging');
 
 /**
diff --git a/core/server/models/client.js b/core/server/models/client.js
index 263c021e74..60b53ed090 100644
--- a/core/server/models/client.js
+++ b/core/server/models/client.js
@@ -1,5 +1,5 @@
 var crypto         = require('crypto'),
-    uuid           = require('node-uuid'),
+    uuid           = require('uuid'),
     ghostBookshelf = require('./base'),
     config         = require('../config'),
     Client,
diff --git a/core/server/models/post.js b/core/server/models/post.js
index 9f0cb4dc4f..357d17aaa7 100644
--- a/core/server/models/post.js
+++ b/core/server/models/post.js
@@ -1,6 +1,6 @@
 // # Post Model
 var _               = require('lodash'),
-    uuid            = require('node-uuid'),
+    uuid            = require('uuid'),
     moment          = require('moment'),
     Promise         = require('bluebird'),
     sequence        = require('../utils/sequence'),
diff --git a/core/test/integration/update_check_spec.js b/core/test/integration/update_check_spec.js
index 78a0d4014a..4c6f693099 100644
--- a/core/test/integration/update_check_spec.js
+++ b/core/test/integration/update_check_spec.js
@@ -2,7 +2,7 @@ var _           = require('lodash'),
     testUtils   = require('../utils'),
     should      = require('should'),
     rewire      = require('rewire'),
-    uuid        = require('node-uuid'),
+    uuid        = require('uuid'),
 
     // Stuff we are testing
     packageInfo      = require('../../../package'),
diff --git a/core/test/unit/utils/tokens_spec.js b/core/test/unit/utils/tokens_spec.js
index ac7c33935d..edd1db3928 100644
--- a/core/test/unit/utils/tokens_spec.js
+++ b/core/test/unit/utils/tokens_spec.js
@@ -1,4 +1,4 @@
-var uuid = require('node-uuid'),
+var uuid = require('uuid'),
     should = require('should'),
     utils = require('../../../server/utils');
 
diff --git a/core/test/utils/fixtures/data-generator.js b/core/test/utils/fixtures/data-generator.js
index 61709ef99b..9c7ef188b8 100644
--- a/core/test/utils/fixtures/data-generator.js
+++ b/core/test/utils/fixtures/data-generator.js
@@ -1,5 +1,5 @@
 var _             = require('lodash'),
-    uuid          = require('node-uuid'),
+    uuid          = require('uuid'),
     ObjectId      = require('bson-objectid'),
     moment        = require('moment'),
     globalUtils   = require('../../../server/utils'),
diff --git a/core/test/utils/index.js b/core/test/utils/index.js
index 782e959773..bcd0bfd8cc 100644
--- a/core/test/utils/index.js
+++ b/core/test/utils/index.js
@@ -5,7 +5,7 @@ var Promise       = require('bluebird'),
     Module        = require('module'),
     debug         = require('debug')('ghost:test'),
     ObjectId      = require('bson-objectid'),
-    uuid          = require('node-uuid'),
+    uuid          = require('uuid'),
     KnexMigrator  = require('knex-migrator'),
     ghost         = require('../../server'),
     errors        = require('../../server/errors'),
diff --git a/package.json b/package.json
index 5133958a14..8201e8f7a0 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,6 @@
     "mysql": "2.11.1",
     "nconf": "0.8.4",
     "netjet": "1.1.3",
-    "node-uuid": "1.4.7",
     "nodemailer": "0.7.1",
     "oauth2orize": "1.6.0",
     "passport": "0.3.2",
@@ -83,6 +82,7 @@
     "showdown-ghost": "0.3.6",
     "superagent": "3.3.1",
     "unidecode": "0.1.8",
+    "uuid": "3.0.0",
     "validator": "5.7.0",
     "xml": "1.0.1"
   },