diff --git a/lib/helpers.js b/lib/helpers.js
index f9d727e38..9e2d2ad34 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -2,6 +2,7 @@
 
 var jsonSafeStringify = require('json-stringify-safe')
   , crypto = require('crypto')
+  , Buffer = require('safe-buffer').Buffer
 
 var defer = typeof setImmediate === 'undefined'
   ? process.nextTick
diff --git a/lib/multipart.js b/lib/multipart.js
index 3b605bd47..4bb15325f 100644
--- a/lib/multipart.js
+++ b/lib/multipart.js
@@ -3,6 +3,7 @@
 var uuid = require('uuid')
   , CombinedStream = require('combined-stream')
   , isstream = require('isstream')
+  , Buffer = require('safe-buffer').Buffer
 
 
 function Multipart (request) {
diff --git a/lib/oauth.js b/lib/oauth.js
index 56b39b0f5..402c89ff5 100644
--- a/lib/oauth.js
+++ b/lib/oauth.js
@@ -6,6 +6,7 @@ var url = require('url')
   , uuid = require('uuid')
   , oauth = require('oauth-sign')
   , crypto = require('crypto')
+  , Buffer = require('safe-buffer').Buffer
 
 
 function OAuth (request) {
diff --git a/package.json b/package.json
index d387eb3aa..feaa3ea4e 100644
--- a/package.json
+++ b/package.json
@@ -44,9 +44,10 @@
     "oauth-sign": "~0.8.1",
     "performance-now": "^0.2.0",
     "qs": "~6.3.0",
+    "safe-buffer": "^5.0.1",
     "stringstream": "~0.0.4",
     "tough-cookie": "~2.3.0",
-    "tunnel-agent": "~0.4.1",
+    "tunnel-agent": "^0.5.0",
     "uuid": "^3.0.0"
   },
   "scripts": {
diff --git a/request.js b/request.js
index 008df9810..5af242207 100644
--- a/request.js
+++ b/request.js
@@ -29,6 +29,7 @@ var http = require('http')
   , Redirect = require('./lib/redirect').Redirect
   , Tunnel = require('./lib/tunnel').Tunnel
   , now = require('performance-now')
+  , Buffer = require('safe-buffer').Buffer
 
 var safeStringify = helpers.safeStringify
   , isReadStream = helpers.isReadStream