diff --git a/.gitignore b/.gitignore
index 1c73b37..4db4e02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ test/test-data/go-ipfs-repo/LOG.old
 
 # while testing npm5
 package-lock.json
+yarn.lock
diff --git a/package.json b/package.json
index c7ccbb7..fcd96c6 100644
--- a/package.json
+++ b/package.json
@@ -35,21 +35,21 @@
   },
   "homepage": "https://github.com/libp2p/js-libp2p-ping",
   "devDependencies": {
-    "aegir": "^18.0.2",
+    "aegir": "^18.0.3",
     "async": "^2.6.1",
     "chai": "^4.2.0",
     "debug": "^4.1.1",
     "dirty-chai": "^2.0.1",
     "libp2p-switch": "~0.41.4",
     "libp2p-tcp": "~0.13.0",
-    "multiaddr": "^6.0.2",
+    "multiaddr": "^6.0.0",
     "peer-book": "~0.9.0",
-    "peer-id": "~0.12.1",
+    "peer-id": "~0.12.0",
     "peer-info": "~0.15.0",
     "run-parallel": "^1.1.9"
   },
   "dependencies": {
-    "libp2p-crypto": "~0.15.0",
+    "libp2p-crypto": "~0.16.0",
     "pull-handshake": "^1.1.4",
     "pull-stream": "^3.6.9"
   },
diff --git a/src/handler.js b/src/handler.js
index ec6c376..12f1793 100644
--- a/src/handler.js
+++ b/src/handler.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
 const handshake = require('pull-handshake')
 const constants = require('./constants')
 const PROTOCOL = constants.PROTOCOL
diff --git a/src/ping.js b/src/ping.js
index 4022a49..2b96cdb 100644
--- a/src/ping.js
+++ b/src/ping.js
@@ -1,7 +1,8 @@
 'use strict'
 
 const EventEmitter = require('events').EventEmitter
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const empty = require('pull-stream/sources/empty')
 const handshake = require('pull-handshake')
 const constants = require('./constants')
 const util = require('./util')
@@ -73,7 +74,7 @@ class Ping extends EventEmitter {
     this._stopped = true
 
     pull(
-      pull.empty(),
+      empty(),
       this.shake.rest()
     )
   }