diff --git a/addr/addr.go b/addr/addr.go
index cdb7058590db15b85c10a2210828b50ba2290d6d..c0c4851c26d585a1900f97b207358225f6c8a2cd 100644
--- a/addr/addr.go
+++ b/addr/addr.go
@@ -5,8 +5,8 @@ import (
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 
-	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
-	manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
+	manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/addr/addr_test.go b/addr/addr_test.go
index 2015b974cda88d8ac3eea90a0d9313c789471c31..21d645724c8ca495303c9dca6e7a6b9c60144982 100644
--- a/addr/addr_test.go
+++ b/addr/addr_test.go
@@ -3,8 +3,8 @@ package addrutil
 import (
 	"testing"
 
-	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
-	manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
+	manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 )
 
 func newMultiaddr(t *testing.T, s string) ma.Multiaddr {
diff --git a/dial_test.go b/dial_test.go
index 77f827c333c592063c83c0fd7fa8756b8606a71a..632ceb7af8a30f7e6acd8102b3da3e6f1ad0367c 100644
--- a/dial_test.go
+++ b/dial_test.go
@@ -13,8 +13,8 @@ import (
 	testutil "util/testutil"
 	ci "util/testutil/ci"
 
-	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
-	manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
+	manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/peers_test.go b/peers_test.go
index cc8e14328f33843e680e060e149b75ded8945e14..29099de46f477b8867faa282a723cb18313365fc 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -5,7 +5,7 @@ import (
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/simul_test.go b/simul_test.go
index c046ac2e4540d71560e76877d591a01f95143775..7adc022f8f68070ef5063bf283c96920e40eaf30 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm.go b/swarm.go
index d09b62ad502d873e3c221232817c107ae094cb2e..2fcd275675dce43d213297f2fae2101fae786dbb 100644
--- a/swarm.go
+++ b/swarm.go
@@ -16,8 +16,8 @@ import (
 	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	mafilter "QmVdADza4QFVAR9xqAxRQjt9vTZJ6UrVLgBstKua1Xg7he/multiaddr-filter"
-	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	mafilter "QmYWqTn1i8yv9QRDzGPJ2yRudKzYCaC5Aqasbm8vwaG92E/multiaddr-filter"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
 	pst "github.com/jbenet/go-stream-muxer"
 	psmss "github.com/jbenet/go-stream-muxer/multistream"
diff --git a/swarm_addr.go b/swarm_addr.go
index 87ee37bf17729ec20a5038639e44e41cdcf88c62..6149eb66e3efb5cdeb6c2c25a115ccc45a6b7bed 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/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 78685a4d382d4d4abb0fc351ea2c4a7b24e493b7..0b0d6fffa5800296fe303acc4f8327239643883f 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm_conn.go b/swarm_conn.go
index c97a47dfcba775e6e0543fe0c9180a7ba036fbff..be95a4282bae040f4266af479bdc2daf296413f2 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/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 47caa69d65712114812c25828aee8c33f62d5f9b..2bedebc2c8b35d0a0f8f0f21d0a08a4137ed6eb5 100644
--- a/swarm_dial.go
+++ b/swarm_dial.go
@@ -8,13 +8,13 @@ import (
 	"sync"
 	"time"
 
-	"QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
+	"QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm_listen.go b/swarm_listen.go
index 394d5c2179f56e1d31cf933229ede8e4478e74b5..ee8ee9136698587f5927ad674166e92b189a50a7 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/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 3c5e69225bd8857731f23123f9f54f0d49f3e9a8..972afc1d02f1622f5260165127f79d2fe82be74b 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/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 3d2ef86d7b2a47172853ba6e02a9602c697040b5..2ba852d18802c30b405fb5a4d2ea9bae0ab07484 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/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 c6e4a981d166d59c8868093e6715c16743f1989a..f9ba35ed040ecd4e5288d604a695cbc95d4d7e25 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
+	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	context "golang.org/x/net/context"
 )