diff --git a/lib/Capability.js b/lib/Capability.js
index 7955c4e370..4a126396a3 100644
--- a/lib/Capability.js
+++ b/lib/Capability.js
@@ -1,4 +1,4 @@
-var jwt = require('jwt-simple'),
+var jwt = require('jsonwebtoken'),
     qs = require('querystring'),
     utils = require('./utils');
 
@@ -71,7 +71,7 @@ Capability.prototype.generate = function(timeout) {
         exp: Math.floor(new Date() / 1000) + expires
     };
 
-    return jwt.encode(payload, this.authToken);
+    return jwt.sign(payload, this.authToken);
 };
 
 module.exports = Capability;
diff --git a/lib/TaskRouterCapability.js b/lib/TaskRouterCapability.js
index a99b417f8d..b1650b68fd 100644
--- a/lib/TaskRouterCapability.js
+++ b/lib/TaskRouterCapability.js
@@ -1,4 +1,4 @@
-var jwt = require('jwt-simple');
+var jwt = require('jsonwebtoken');
 var deprecate = require('deprecate');
 var _ = require('underscore')
 require('string.prototype.startswith');
@@ -176,8 +176,8 @@ TaskRouterCapability.prototype._generate = function(ttl, extraAttributes) {
         friendly_name: this.channelId,
         policies: this.policies,
     };
-    _.extend(payload, extraAttributes) 
-    return jwt.encode(payload, this.authToken);
+    _.extend(payload, extraAttributes);
+    return jwt.sign(payload, this.authToken);
 }
 
 module.exports = TaskRouterCapability;
diff --git a/package.json b/package.json
index 1e096edc12..05fcc6ee5e 100644
--- a/package.json
+++ b/package.json
@@ -14,14 +14,13 @@
     "url": "https://github.com/twilio/twilio-node.git"
   },
   "dependencies": {
-    "request": "2.74.x",
-    "underscore": "1.x",
+    "deprecate": "^0.1.0",
     "jsonwebtoken": "5.4.x",
-    "jwt-simple": "0.1.x",
     "q": "0.9.7",
+    "request": "2.74.x",
     "scmp": "0.0.3",
-    "deprecate": "^0.1.0",
-    "string.prototype.startswith": "^0.2.0"
+    "string.prototype.startswith": "^0.2.0",
+    "underscore": "1.x"
   },
   "devDependencies": {
     "express": "3.x",
diff --git a/spec/task_router_capability.spec.js b/spec/task_router_capability.spec.js
index 1bb970e39e..4f1bd710bc 100644
--- a/spec/task_router_capability.spec.js
+++ b/spec/task_router_capability.spec.js
@@ -1,5 +1,5 @@
 var twilio = require('../index'),
-    jwt = require('jwt-simple');
+    jwt = require('jsonwebtoken');
 
 describe('The TaskRouter Capability Token Object', function() {
 
diff --git a/spec/task_router_capability_deprecated.spec.js b/spec/task_router_capability_deprecated.spec.js
index 4e0f4e5f08..3194226e00 100644
--- a/spec/task_router_capability_deprecated.spec.js
+++ b/spec/task_router_capability_deprecated.spec.js
@@ -1,5 +1,5 @@
 var twilio = require('../index'),
-    jwt = require('jwt-simple');
+    jwt = require('jsonwebtoken');
 
 describe('The TaskRouter Capability Deprecated Token Object', function() {
 
diff --git a/spec/task_router_capability_taskqueue.spec.js b/spec/task_router_capability_taskqueue.spec.js
index 08194e877f..ac85b525dc 100644
--- a/spec/task_router_capability_taskqueue.spec.js
+++ b/spec/task_router_capability_taskqueue.spec.js
@@ -1,5 +1,5 @@
 var twilio = require('../index'),
-    jwt = require('jwt-simple');
+    jwt = require('jsonwebtoken');
 
 describe('The TaskRouter TaskQueue Capability Token Object', function() {
 
diff --git a/spec/task_router_capability_worker.spec.js b/spec/task_router_capability_worker.spec.js
index aecc81a834..1eb4621aed 100644
--- a/spec/task_router_capability_worker.spec.js
+++ b/spec/task_router_capability_worker.spec.js
@@ -1,5 +1,5 @@
 var twilio = require('../index'),
-    jwt = require('jwt-simple');
+    jwt = require('jsonwebtoken');
 
 describe('The TaskRouter Worker Capability Token Object', function() {
 
diff --git a/spec/task_router_capability_workspace.spec.js b/spec/task_router_capability_workspace.spec.js
index 4ff606dd01..f220398487 100644
--- a/spec/task_router_capability_workspace.spec.js
+++ b/spec/task_router_capability_workspace.spec.js
@@ -1,5 +1,5 @@
 var twilio = require('../index'),
-    jwt = require('jwt-simple');
+    jwt = require('jsonwebtoken');
 
 describe('The TaskRouter Workspace Capability Token Object', function() {