diff --git a/lib/create.js b/lib/create.js
index 4520344..9ec4de4 100644
--- a/lib/create.js
+++ b/lib/create.js
@@ -30,7 +30,7 @@ var findVolume = function (startPath, startStat) {
 }
 
 var utf16be = function (str) {
-  var b = new Buffer(str, 'ucs2')
+  var b = Buffer.from(str, 'ucs2')
   for (var i = 0; i < b.length; i += 2) {
     var a = b[i]
     b[i] = b[i + 1]
@@ -70,7 +70,7 @@ module.exports = exports = function (targetPath) {
   };
 
   (function addType0 () {
-    var b = new Buffer(info.parent.name, 'utf8')
+    var b = Buffer.from(info.parent.name, 'utf8')
 
     info.extra.push({
       type: 0,
@@ -80,7 +80,7 @@ module.exports = exports = function (targetPath) {
   }());
 
   (function addType1 () {
-    var b = new Buffer(4)
+    var b = Buffer.alloc(4)
 
     b.writeUInt32BE(info.parent.id, 0)
 
@@ -93,7 +93,7 @@ module.exports = exports = function (targetPath) {
 
   (function addType14 () {
     var l = info.target.filename.length
-    var b = new Buffer(2 + (l * 2))
+    var b = Buffer.alloc(2 + (l * 2))
 
     b.writeUInt16BE(l, 0)
     utf16be(info.target.filename).copy(b, 2)
@@ -107,7 +107,7 @@ module.exports = exports = function (targetPath) {
 
   (function addType15 () {
     var l = info.volume.name.length
-    var b = new Buffer(2 + (l * 2))
+    var b = Buffer.alloc(2 + (l * 2))
 
     b.writeUInt16BE(l, 0)
     utf16be(info.volume.name).copy(b, 2)
@@ -123,7 +123,7 @@ module.exports = exports = function (targetPath) {
     var vl = volumePath.length
     assert.equal(targetPath.slice(0, vl), volumePath)
     var lp = targetPath.slice(vl)
-    var b = new Buffer(lp, 'utf8')
+    var b = Buffer.from(lp, 'utf8')
 
     info.extra.push({
       type: 18,
@@ -133,7 +133,7 @@ module.exports = exports = function (targetPath) {
   }());
 
   (function addType19 () {
-    var b = new Buffer(volumePath, 'utf8')
+    var b = Buffer.from(volumePath, 'utf8')
 
     info.extra.push({
       type: 19,
diff --git a/lib/encode.js b/lib/encode.js
index d43dae2..16a4ca3 100644
--- a/lib/encode.js
+++ b/lib/encode.js
@@ -24,7 +24,7 @@ module.exports = exports = function (info) {
   }, 0)
   var trailerLength = 4
 
-  var buf = new Buffer(baseLength + extraLength + trailerLength)
+  var buf = Buffer.alloc(baseLength + extraLength + trailerLength)
 
   buf.writeUInt32BE(0, 0)
 
diff --git a/lib/is-alias.js b/lib/is-alias.js
index 52225f2..f98484a 100644
--- a/lib/is-alias.js
+++ b/lib/is-alias.js
@@ -6,7 +6,7 @@ module.exports = function isAlias (path) {
   var fd = fs.openSync(path, 'r')
 
   try {
-    read = new Buffer(16)
+    read = Buffer.alloc(16)
     fs.readSync(fd, read, 0, 16, 0)
   } finally {
     fs.closeSync(fd)
diff --git a/package.json b/package.json
index 336ede1..f55b386 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
   "contributors": [
     "Linus Unnebäck <linus@folkdatorn.se>",
     "Davide Liessi <davide.liessi@gmail.com>",
-    "Joshua Warner <joshuawarner32@gmail.com>"
+    "Joshua Warner <joshuawarner32@gmail.com>",
+    "Jozef Izso <jozef.izso@gmail.com>"
   ],
   "os": [
     "darwin"
diff --git a/test/basics.js b/test/basics.js
index 3cdacab..cb2a7b8 100644
--- a/test/basics.js
+++ b/test/basics.js
@@ -7,7 +7,7 @@ var path = require('path')
 var temp = require('fs-temp')
 var assert = require('assert')
 
-var rawData = new Buffer(
+var rawData = Buffer.from(
   'AAAAAAEqAAIAAApUZXN0IFRpdGxlAAAAAAAAAAAAAAAAAAAAAADO615USCsA' +
   'BQAAABMMVGVzdEJrZy50aWZmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' +
   'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFM7rXlgAAAAAAAAAAP////8A' +
@@ -70,8 +70,8 @@ describe('isAlias', function () {
   var aliasFile, garbageFile
 
   before(function () {
-    aliasFile = temp.writeFileSync(new Buffer('626f6f6b000000006d61726b00000000', 'hex'))
-    garbageFile = temp.writeFileSync(new Buffer('Hello my name is Linus!'))
+    aliasFile = temp.writeFileSync(Buffer.from('626f6f6b000000006d61726b00000000', 'hex'))
+    garbageFile = temp.writeFileSync(Buffer.from('Hello my name is Linus!'))
   })
 
   after(function () {