diff --git a/.gx/lastpubver b/.gx/lastpubver
index 21d49e9fcc5ec0d1fb029a02c629defcafc9db17..95a519d8f25103a2b0023022210c427aa52b5a9b 100644
--- a/.gx/lastpubver
+++ b/.gx/lastpubver
@@ -1 +1 @@
-0.9.30: Qmch44z24hut8iN2snohMNLiX63E3QfZLMQKoe14iZ3FhQ
+0.9.31: QmUK4h113Hh7bR2gPpsMcbUEbbzc7hspocmPi91Bmi69nH
diff --git a/comm.go b/comm.go
index b05afe6b45033ce0ca84d897a0981ebc4fa91d6a..fded9a818921b8f93b283f361f28b7a3d5b2d321 100644
--- a/comm.go
+++ b/comm.go
@@ -7,9 +7,9 @@ import (
 
 	pb "github.com/libp2p/go-floodsub/pb"
 
-	inet "gx/ipfs/QmQdLcvoy3JuSqhV6iwQ9T6Cv7hWLAdzob4jUZRPqFL67Z/go-libp2p-net"
-	ggio "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/io"
-	proto "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto"
+	ggio "github.com/gogo/protobuf/io"
+	proto "github.com/gogo/protobuf/proto"
+	inet "github.com/libp2p/go-libp2p-net"
 )
 
 // get the initial RPC containing all of our subscriptions to send to new peers
diff --git a/floodsub.go b/floodsub.go
index b44821458ab791bfe3c962ae3431cefbea0ee703..1b2eb08ea2688288ec2b3cff989aca252ebac42c 100644
--- a/floodsub.go
+++ b/floodsub.go
@@ -5,9 +5,9 @@ import (
 
 	pb "github.com/libp2p/go-floodsub/pb"
 
-	host "gx/ipfs/QmX9pw5dSUZ2FozbppcSDJiS7eEh1RFwJNwrbmyLoUMS9x/go-libp2p-host"
-	protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
-	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	host "github.com/libp2p/go-libp2p-host"
+	peer "github.com/libp2p/go-libp2p-peer"
+	protocol "github.com/libp2p/go-libp2p-protocol"
 )
 
 const (
diff --git a/floodsub_test.go b/floodsub_test.go
index 81d6dfd2bb67fa37945e5484f1b2187916685422..b0196ca0d40c71ab86418e329bf463d75776c27d 100644
--- a/floodsub_test.go
+++ b/floodsub_test.go
@@ -10,12 +10,12 @@ import (
 	"testing"
 	"time"
 
-	host "gx/ipfs/QmX9pw5dSUZ2FozbppcSDJiS7eEh1RFwJNwrbmyLoUMS9x/go-libp2p-host"
-	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
-	swarmt "gx/ipfs/QmcyQj1V6Ht8uSrRqj865UXGUo5Sc8GxNA4U8bLQxCSmfX/go-libp2p-swarm/testing"
+	host "github.com/libp2p/go-libp2p-host"
+	peer "github.com/libp2p/go-libp2p-peer"
+	swarmt "github.com/libp2p/go-libp2p-swarm/testing"
 	//bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
-	bhost "gx/ipfs/QmSG4P432Eomm1s8rkgUuBk9Nzp8YjY35RUcJTGT2Huwki/go-libp2p-blankhost"
-	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
+	bhost "github.com/libp2p/go-libp2p-blankhost"
+	"github.com/libp2p/go-libp2p-protocol"
 )
 
 func checkMessageRouting(t *testing.T, topic string, pubs []*PubSub, subs []*Subscription) {
diff --git a/gossipsub.go b/gossipsub.go
index 951c47edffff041271d9026ba16084bf4ef07593..fcdf298a2fb643d120347bc52a57a22bdac2723f 100644
--- a/gossipsub.go
+++ b/gossipsub.go
@@ -7,9 +7,9 @@ import (
 
 	pb "github.com/libp2p/go-floodsub/pb"
 
-	host "gx/ipfs/QmX9pw5dSUZ2FozbppcSDJiS7eEh1RFwJNwrbmyLoUMS9x/go-libp2p-host"
-	protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
-	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	host "github.com/libp2p/go-libp2p-host"
+	peer "github.com/libp2p/go-libp2p-peer"
+	protocol "github.com/libp2p/go-libp2p-protocol"
 )
 
 const (
diff --git a/gossipsub_test.go b/gossipsub_test.go
index d55356b8bf6b2f2ef60dcc6246c52dd7d2e550a6..8dae7ff5707737b6fd9cbd4473f3019e26b2dd6f 100644
--- a/gossipsub_test.go
+++ b/gossipsub_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	host "gx/ipfs/QmX9pw5dSUZ2FozbppcSDJiS7eEh1RFwJNwrbmyLoUMS9x/go-libp2p-host"
+	host "github.com/libp2p/go-libp2p-host"
 )
 
 func getGossipsubs(ctx context.Context, hs []host.Host, opts ...Option) []*PubSub {
diff --git a/notify.go b/notify.go
index 998cba0160fc937ebf6f7180ec92235cddaaa44b..3da7ee37bbb1e08353a14783d73eddd665dbf17d 100644
--- a/notify.go
+++ b/notify.go
@@ -1,8 +1,8 @@
 package floodsub
 
 import (
-	inet "gx/ipfs/QmQdLcvoy3JuSqhV6iwQ9T6Cv7hWLAdzob4jUZRPqFL67Z/go-libp2p-net"
-	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
+	inet "github.com/libp2p/go-libp2p-net"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 var _ inet.Notifiee = (*PubSubNotif)(nil)
diff --git a/package.json b/package.json
index 51856c6896549d598679b65f33d1f2960568df2b..7451de180b4678b35c164d87b9c8f6c1c40682e2 100644
--- a/package.json
+++ b/package.json
@@ -56,9 +56,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmcyQj1V6Ht8uSrRqj865UXGUo5Sc8GxNA4U8bLQxCSmfX",
+      "hash": "QmcALnLPFXgLLaZkXzGv99yt8xPfiWqFTumiXpWBJbU9cY",
       "name": "go-libp2p-swarm",
-      "version": "3.0.14"
+      "version": "3.0.15"
     },
     {
       "author": "whyrusleeping",
@@ -72,6 +72,6 @@
   "license": "",
   "name": "go-libp2p-floodsub",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "0.9.30"
+  "version": "0.9.31"
 }
 
diff --git a/pb/rpc.pb.go b/pb/rpc.pb.go
index d91e2869a69de4c9d3b76a24cc2bccda4441b588..b4d7bcf189ce95a9a199386c723c4c2b6fff807c 100644
--- a/pb/rpc.pb.go
+++ b/pb/rpc.pb.go
@@ -3,7 +3,7 @@
 
 package floodsub_pb
 
-import proto "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto"
+import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
diff --git a/pubsub.go b/pubsub.go
index 043d7ffce375e847f9f2e26ca69a0a6d4f320632..4d5415ac4f1830a25d7d1f2d27287e29d0ec4bee 100644
--- a/pubsub.go
+++ b/pubsub.go
@@ -10,12 +10,12 @@ import (
 
 	pb "github.com/libp2p/go-floodsub/pb"
 
-	inet "gx/ipfs/QmQdLcvoy3JuSqhV6iwQ9T6Cv7hWLAdzob4jUZRPqFL67Z/go-libp2p-net"
-	host "gx/ipfs/QmX9pw5dSUZ2FozbppcSDJiS7eEh1RFwJNwrbmyLoUMS9x/go-libp2p-host"
-	timecache "gx/ipfs/QmYftoT56eEfUBTD3erR6heXuPSUhGRezSmhSU8LeczP8b/timecache"
-	logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log"
-	protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
-	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	logging "github.com/ipfs/go-log"
+	host "github.com/libp2p/go-libp2p-host"
+	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	protocol "github.com/libp2p/go-libp2p-protocol"
+	timecache "github.com/whyrusleeping/timecache"
 )
 
 const (