diff --git a/addr/addr.go b/addr/addr.go
index cec777a25eeefab6697f40a8328ae91907e3f94c..cdb7058590db15b85c10a2210828b50ba2290d6d 100644
--- a/addr/addr.go
+++ b/addr/addr.go
@@ -5,8 +5,8 @@ import (
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
 	context "golang.org/x/net/context"
 )
 
diff --git a/addr/addr_test.go b/addr/addr_test.go
index 49eec13511dd4ef99ee4db9d0eb7929f98bfff2e..2015b974cda88d8ac3eea90a0d9313c789471c31 100644
--- a/addr/addr_test.go
+++ b/addr/addr_test.go
@@ -3,8 +3,8 @@ package addrutil
 import (
 	"testing"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
 )
 
 func newMultiaddr(t *testing.T, s string) ma.Multiaddr {
diff --git a/dial_test.go b/dial_test.go
index f121f97f05126faf867c4172c2d117f9f4906a4e..77f827c333c592063c83c0fd7fa8756b8606a71a 100644
--- a/dial_test.go
+++ b/dial_test.go
@@ -13,8 +13,8 @@ import (
 	testutil "util/testutil"
 	ci "util/testutil/ci"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
 	context "golang.org/x/net/context"
 )
 
diff --git a/peers_test.go b/peers_test.go
index b107fbfe839b1ca47fcb8ebbe9d021d121402caf..cc8e14328f33843e680e060e149b75ded8945e14 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -5,7 +5,7 @@ import (
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/simul_test.go b/simul_test.go
index 63e07ff8ac7e0eade7e2fb0dff33a48338f06242..c046ac2e4540d71560e76877d591a01f95143775 100644
--- a/simul_test.go
+++ b/simul_test.go
@@ -9,7 +9,7 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	ci "util/testutil/ci"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm.go b/swarm.go
index 245b7204f7cc16039f7d90bcf004a4d8062e5c40..d09b62ad502d873e3c221232817c107ae094cb2e 100644
--- a/swarm.go
+++ b/swarm.go
@@ -16,14 +16,14 @@ import (
 	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "github.com/jbenet/go-multiaddr"
+	mafilter "QmVdADza4QFVAR9xqAxRQjt9vTZJ6UrVLgBstKua1Xg7he/multiaddr-filter"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
 	pst "github.com/jbenet/go-stream-muxer"
 	psmss "github.com/jbenet/go-stream-muxer/multistream"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
 	prom "github.com/prometheus/client_golang/prometheus"
-	mafilter "github.com/whyrusleeping/multiaddr-filter"
 	context "golang.org/x/net/context"
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
diff --git a/swarm_addr.go b/swarm_addr.go
index 039683bfb9cb77000dc3295778446c1218fd836a..87ee37bf17729ec20a5038639e44e41cdcf88c62 100644
--- a/swarm_addr.go
+++ b/swarm_addr.go
@@ -4,7 +4,7 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 )
 
 // ListenAddresses returns a list of addresses at which this swarm listens.
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index b1f167ae49a441ddbb82625d7ceea12b4dbf4c10..78685a4d382d4d4abb0fc351ea2c4a7b24e493b7 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -8,7 +8,7 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	testutil "util/testutil"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm_conn.go b/swarm_conn.go
index 840a9b465c111ae6ea3c8936ceba76617cf13e4a..c97a47dfcba775e6e0543fe0c9180a7ba036fbff 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -8,7 +8,7 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
 	context "golang.org/x/net/context"
 )
diff --git a/swarm_dial.go b/swarm_dial.go
index 4790eb073826638f85066132f40db80d4ed4431c..47caa69d65712114812c25828aee8c33f62d5f9b 100644
--- a/swarm_dial.go
+++ b/swarm_dial.go
@@ -8,13 +8,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jbenet/go-multiaddr-net"
+	"QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	lgbl "util/eventlog/loggables"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm_listen.go b/swarm_listen.go
index f3da2eeea74369c26ed11f8426a5e195d7df2999..394d5c2179f56e1d31cf933229ede8e4478e74b5 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -9,7 +9,7 @@ import (
 	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
 	lgbl "util/eventlog/loggables"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
 	context "golang.org/x/net/context"
 )
diff --git a/swarm_net.go b/swarm_net.go
index 91c4208370af3008766fb39a315344e6db6b53f7..3c5e69225bd8857731f23123f9f54f0d49f3e9a8 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -8,7 +8,7 @@ import (
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	"github.com/jbenet/goprocess"
 	context "golang.org/x/net/context"
 )
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index 0d976e81d0c16aefd5e2264e83226c93537b602d..3d2ef86d7b2a47172853ba6e02a9602c697040b5 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	context "golang.org/x/net/context"
 
 	inet "github.com/ipfs/go-libp2p/p2p/net"
diff --git a/swarm_test.go b/swarm_test.go
index 2c98e5e854b1570a2d9924e537497954103c8790..c6e4a981d166d59c8868093e6715c16743f1989a 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -14,7 +14,7 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	testutil "util/testutil"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
 	context "golang.org/x/net/context"
 )