diff --git a/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go
index 06248360e822f31647140bb0c1bce771837ffd2f..0f662cd9338050b5f8efe34db0ccdfa617684d04 100644
--- a/p2p/host/basic/basic_host.go
+++ b/p2p/host/basic/basic_host.go
@@ -17,8 +17,7 @@ import (
 	pstore "github.com/libp2p/go-libp2p-peerstore"
 	protocol "github.com/libp2p/go-libp2p-protocol"
 	ma "github.com/multiformats/go-multiaddr"
-
-	msmux "github.com/whyrusleeping/go-multistream"
+	msmux "github.com/multiformats/go-multistream"
 )
 
 var log = logging.Logger("basichost")
diff --git a/p2p/host/routed/routed.go b/p2p/host/routed/routed.go
index 81b3c6381fa10f77a14812e5fea9d0ab62da83dd..97493ad5e4590f959f5a32728c839fa3cb287da4 100644
--- a/p2p/host/routed/routed.go
+++ b/p2p/host/routed/routed.go
@@ -14,7 +14,7 @@ import (
 	pstore "github.com/libp2p/go-libp2p-peerstore"
 	protocol "github.com/libp2p/go-libp2p-protocol"
 	ma "github.com/multiformats/go-multiaddr"
-	msmux "github.com/whyrusleeping/go-multistream"
+	msmux "github.com/multiformats/go-multistream"
 )
 
 var log = logging.Logger("routedhost")
diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go
index 325ce8a7faf82940f0538009763a7cbac6d46436..8da52c0cd028dd7fae58218eb17587e4ed04e5c3 100644
--- a/p2p/protocol/identify/id.go
+++ b/p2p/protocol/identify/id.go
@@ -19,7 +19,7 @@ import (
 	peer "github.com/libp2p/go-libp2p-peer"
 	pstore "github.com/libp2p/go-libp2p-peerstore"
 	ma "github.com/multiformats/go-multiaddr"
-	msmux "github.com/whyrusleeping/go-multistream"
+	msmux "github.com/multiformats/go-multistream"
 )
 
 var log = logging.Logger("net/identify")
diff --git a/p2p/protocol/relay/relay_test.go b/p2p/protocol/relay/relay_test.go
index 2c24d3f7d09deeaa49a6dea7fa26184e16373bd6..d1df7c20d46f04b194b929340ddcc95f8a1d5811 100644
--- a/p2p/protocol/relay/relay_test.go
+++ b/p2p/protocol/relay/relay_test.go
@@ -12,7 +12,7 @@ import (
 	inet "github.com/libp2p/go-libp2p-net"
 	testutil "github.com/libp2p/go-libp2p-netutil"
 	protocol "github.com/libp2p/go-libp2p-protocol"
-	msmux "github.com/whyrusleeping/go-multistream"
+	msmux "github.com/multiformats/go-multistream"
 )
 
 var log = logging.Logger("relay_test")
diff --git a/package.json b/package.json
index b3953a1d82fdd78c484df6ee3fa9eb1228573324..464bc180acf5c4a2a7a5c5908e5b9dc80cd7b8eb 100644
--- a/package.json
+++ b/package.json
@@ -211,15 +211,15 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "Qmb55YjV8z4PNChVKZM5rehSFLtgDURmDZ8d3DdkvBBZR1",
+      "hash": "QmNs7ZGmoV888a8aNysuNorScVv3vQVHS9wfut1E4Y1PQ1",
       "name": "go-libp2p-host",
-      "version": "1.3.4"
+      "version": "1.3.6"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmfSEkiXoCxTkRajpiHiyruDGSGpX9n6NivdFQJWBGVCQM",
+      "hash": "QmTGpHWXefaMcPzmEJnh9qgUHyMbJ8jye4EhNhhXguGyVe",
       "name": "go-libp2p-swarm",
-      "version": "1.6.4"
+      "version": "1.6.5"
     },
     {
       "author": "whyrusleeping",
@@ -229,15 +229,15 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmUcaGGriHNMtx7udfjUFQ7yDVq8zopYRDey5Lj68z5DZQ",
+      "hash": "QmVmNjPdCCbt1We7p4oLLeBJ9vRLcis3KPVfKvfTfqrFXh",
       "name": "go-libp2p-netutil",
-      "version": "0.2.4"
+      "version": "0.2.5"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmRg8JoySAwWunyjZwwo8fbm5ysw3vv3ggSHcmw8KXzk6f",
+      "hash": "QmYKFZpK6c6NvjnGG7NdCvYbbgMV5yr7HgYLYnnkrepNPF",
       "name": "go-libp2p-blankhost",
-      "version": "0.1.4"
+      "version": "0.1.5"
     }
   ],
   "gxVersion": "0.4.0",