diff --git a/package.json b/package.json
index dae232400ebe581993a0e0350a459367ef62f5f6..5e45e3b32d7e99e7b3cf22f074dd9e70cd0a67d9 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,9 @@
   "gxDependencies": [
     {
       "author": "whyrusleeping",
-      "hash": "QmZ3qHMAtW9WEHexN3HsjSoduUBbrBPXMEoeddQtqdJUJ6",
+      "hash": "QmdysBu77i3YaagNtMAjiCJdeWWvds18ho5XEB784guQ41",
       "name": "go-libp2p-net",
-      "version": "1.3.0"
+      "version": "1.5.0"
     },
     {
       "author": "whyrusleeping",
@@ -75,15 +75,15 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "Qmezvofp8DAh8GnU395s2cvim7uACGp6DdiKVftAesEovw",
+      "hash": "QmVcNzHewFvmVah1CGqg8NV7nHHsPu19U43YE5b2oqWyBp",
       "name": "go-libp2p-metrics",
-      "version": "1.3.0"
+      "version": "1.5.0"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmdiBXu57LDzaoovc89jypRSNEhxVZ4zRig2AsXm9VwrsS",
+      "hash": "QmeFCCpGjB663gcLVS7Kz6ZSXyFgx5aJwQu27xkwyWdWiG",
       "name": "go-libp2p-conn",
-      "version": "1.2.1"
+      "version": "1.4.0"
     },
     {
       "author": "whyrusleeping",
diff --git a/swarm.go b/swarm.go
index ec156d4e4b349dac127643623b0a3e758987c8eb..3a59517c34a7df0408a62dcf36627163f27952f4 100644
--- a/swarm.go
+++ b/swarm.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	logging "github.com/ipfs/go-log"
-	ps "github.com/jbenet/go-peerstream"
 	pst "github.com/jbenet/go-stream-muxer"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
@@ -26,6 +25,7 @@ import (
 	pstore "github.com/libp2p/go-libp2p-peerstore"
 	transport "github.com/libp2p/go-libp2p-transport"
 	filter "github.com/libp2p/go-maddr-filter"
+	ps "github.com/libp2p/go-peerstream"
 	tcpt "github.com/libp2p/go-tcp-transport"
 	ma "github.com/multiformats/go-multiaddr"
 	psmss "github.com/whyrusleeping/go-smux-multistream"
diff --git a/swarm_conn.go b/swarm_conn.go
index bc5b69e4ad49272b3f75f3730755edb00c015d9d..4b13be54f1a8f48276c34286cdbe18a5260308f2 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	ps "github.com/jbenet/go-peerstream"
 	ic "github.com/libp2p/go-libp2p-crypto"
 	iconn "github.com/libp2p/go-libp2p-interface-conn"
 	inet "github.com/libp2p/go-libp2p-net"
 	peer "github.com/libp2p/go-libp2p-peer"
+	ps "github.com/libp2p/go-peerstream"
 	ma "github.com/multiformats/go-multiaddr"
 )
 
diff --git a/swarm_listen.go b/swarm_listen.go
index d76d1e640efc7f9dec2c189b1d9e949f4eea748d..571a305e3aa0d3ef6b0fe12be1b9f675dbbfb890 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -4,13 +4,13 @@ import (
 	"context"
 	"fmt"
 
-	ps "github.com/jbenet/go-peerstream"
 	conn "github.com/libp2p/go-libp2p-conn"
 	iconn "github.com/libp2p/go-libp2p-interface-conn"
 	lgbl "github.com/libp2p/go-libp2p-loggables"
 	mconn "github.com/libp2p/go-libp2p-metrics/conn"
 	inet "github.com/libp2p/go-libp2p-net"
 	transport "github.com/libp2p/go-libp2p-transport"
+	ps "github.com/libp2p/go-peerstream"
 	ma "github.com/multiformats/go-multiaddr"
 )
 
diff --git a/swarm_stream.go b/swarm_stream.go
index e3b12563bbe15786c5b36f145c22d3a06e55919a..771038621f18a907db2b2bf668fce48bc173b10a 100644
--- a/swarm_stream.go
+++ b/swarm_stream.go
@@ -4,7 +4,7 @@ import (
 	inet "github.com/libp2p/go-libp2p-net"
 	protocol "github.com/libp2p/go-libp2p-protocol"
 
-	ps "github.com/jbenet/go-peerstream"
+	ps "github.com/libp2p/go-peerstream"
 )
 
 // Stream is a wrapper around a ps.Stream that exposes a way to get