diff --git a/Cargo.lock b/Cargo.lock
index 1532c09c2..93d701548 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -265,8 +265,8 @@ dependencies = [
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libipld 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-swarm 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-swarm 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost-build 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1214,7 +1214,7 @@ dependencies = [
  "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libipld 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "multibase 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "multihash 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1384,34 +1384,34 @@ dependencies = [
 [[package]]
 name = "libp2p"
 version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core-derive 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-deflate 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-dns 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-floodsub 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-gossipsub 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-identify 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-kad 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-mdns 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-mplex 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-noise 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-ping 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-plaintext 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-pnet 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-secio 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-swarm 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-tcp 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-uds 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-wasm-ext 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-websocket 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-yamux 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-core-derive 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-deflate 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-dns 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-floodsub 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-gossipsub 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-identify 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-kad 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-mdns 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-mplex 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-noise 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-ping 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-plaintext 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-pnet 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-secio 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-swarm 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-tcp 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-uds 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-wasm-ext 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-websocket 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-yamux 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "parity-multiaddr 0.7.3 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "parity-multihash 0.2.3 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1421,7 +1421,7 @@ dependencies = [
 [[package]]
 name = "libp2p-core"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "asn1_der 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1432,9 +1432,9 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "multistream-select 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multistream-select 0.7.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "parity-multiaddr 0.7.3 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "parity-multihash 0.2.3 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1453,7 +1453,7 @@ dependencies = [
 [[package]]
 name = "libp2p-core-derive"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1462,33 +1462,33 @@ dependencies = [
 [[package]]
 name = "libp2p-deflate"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
 ]
 
 [[package]]
 name = "libp2p-dns"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libp2p-floodsub"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "cuckoofilter 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-swarm 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-swarm 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost-build 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1498,7 +1498,7 @@ dependencies = [
 [[package]]
 name = "libp2p-gossipsub"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1506,8 +1506,8 @@ dependencies = [
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures_codec 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-swarm 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-swarm 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1522,11 +1522,11 @@ dependencies = [
 [[package]]
 name = "libp2p-identify"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-swarm 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-swarm 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost-build 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1537,7 +1537,7 @@ dependencies = [
 [[package]]
 name = "libp2p-kad"
 version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1545,10 +1545,10 @@ dependencies = [
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures_codec 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-swarm 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-swarm 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multihash 0.2.3 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost-build 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1563,7 +1563,7 @@ dependencies = [
 [[package]]
 name = "libp2p-mdns"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "async-std 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "data-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1571,8 +1571,8 @@ dependencies = [
  "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-swarm 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-swarm 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1584,13 +1584,13 @@ dependencies = [
 [[package]]
 name = "libp2p-mplex"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures_codec 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unsigned-varint 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1599,12 +1599,12 @@ dependencies = [
 [[package]]
 name = "libp2p-noise"
 version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost-build 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1619,11 +1619,11 @@ dependencies = [
 [[package]]
 name = "libp2p-ping"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-swarm 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
+ "libp2p-swarm 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1633,12 +1633,12 @@ dependencies = [
 [[package]]
 name = "libp2p-plaintext"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures_codec 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost-build 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1650,7 +1650,7 @@ dependencies = [
 [[package]]
 name = "libp2p-pnet"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1663,7 +1663,7 @@ dependencies = [
 [[package]]
 name = "libp2p-secio"
 version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ctr 0.3.2 (git+https://github.com/koivunej/stream-ciphers.git?branch=ctr128-64to128)",
@@ -1671,7 +1671,7 @@ dependencies = [
  "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-send-wrapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1692,10 +1692,10 @@ dependencies = [
 [[package]]
 name = "libp2p-swarm"
 version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1705,36 +1705,36 @@ dependencies = [
 [[package]]
 name = "libp2p-tcp"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "async-std 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnet 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libp2p-uds"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "async-std 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libp2p-wasm-ext"
 version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "parity-send-wrapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1743,13 +1743,13 @@ dependencies = [
 [[package]]
 name = "libp2p-websocket"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "async-tls 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quicksink 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1763,13 +1763,13 @@ dependencies = [
 [[package]]
 name = "libp2p-yamux"
 version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "thiserror 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "yamux 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yamux 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2013,7 +2013,7 @@ dependencies = [
 [[package]]
 name = "multistream-select"
 version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2116,13 +2116,13 @@ dependencies = [
 [[package]]
 name = "parity-multiaddr"
 version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "data-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multihash 0.2.3 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)",
  "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2133,7 +2133,7 @@ dependencies = [
 [[package]]
 name = "parity-multihash"
 version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts#7314b7dccdc457c574d823cdf7a9cbaf97d6273d"
 dependencies = [
  "blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3686,16 +3686,15 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "nohash-hasher 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "thiserror 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3868,28 +3867,28 @@ dependencies = [
 "checksum libipld-base 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e8c4f844ea2e357f53cb53a2dd28a1dd4ab9d61d75d121cb8468b1a12b621970"
 "checksum libipld-macro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6fbc55b3b493e909833fb7af7f5deed4e994e2c625c648777711f8791a02ebb5"
 "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-"checksum libp2p 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bba17ee9cac4bb89de5812159877d9b4f0a993bf41697a5a875940cd1eb71f24"
-"checksum libp2p-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b874594c4b29de1a29f27871feba8e6cd13aa54a8a1e8f8c7cf3dfac5ca287c"
-"checksum libp2p-core-derive 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96d472e9d522f588805c77801de10b957be84e10f019ca5f869fa1825b15ea9b"
-"checksum libp2p-deflate 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e25004d4d9837b44b22c5f1a69be1724a5168fef6cff1716b5176a972c3aa62"
-"checksum libp2p-dns 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b99e552f9939b606eb4b59f7f64d9b01e3f96752f47e350fc3c5fc646ed3f649"
-"checksum libp2p-floodsub 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d3234f12e44f9a50351a9807b97fe7de11eb9ae4482370392ba10da6dc90722"
-"checksum libp2p-gossipsub 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d46cb3e0841bd951cbf4feae56cdc081e6347836a644fb260c3ec554149b4006"
-"checksum libp2p-identify 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfeb935a9bd41263e4f3a24b988e9f4a044f3ae89ac284e83c17fe2f84e0d66b"
-"checksum libp2p-kad 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "464dc8412978d40f0286be72ed9ab5e0e1386a4a06e7f174526739b5c3c1f041"
-"checksum libp2p-mdns 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "881fcfb360c2822db9f0e6bb6f89529621556ed9a8b038313414eda5107334de"
-"checksum libp2p-mplex 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d8507b37ad0eed275efcde67a023c3d85af6c80768b193845b9288e848e1af95"
-"checksum libp2p-noise 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b15a8a3d71f898beb6f854c8aae27aa1d198e0d1f2e49412261c2d90ef39675a"
-"checksum libp2p-ping 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33d22f2f228b3a828dca1cb8aa9fa331e0bc9c36510cb2c1916956e20dc85e8c"
-"checksum libp2p-plaintext 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56126a204d7b3382bac163143ff4125a14570b3ba76ba979103d1ae1abed1923"
-"checksum libp2p-pnet 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b916938a8868f75180aeeffcc6a516a922d165e8fa2a90b57bad989d1ccbb57a"
-"checksum libp2p-secio 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1219e9ecb4945d7331a05f5ffe96a1f6e28051bfa1223d4c60353c251de0354e"
-"checksum libp2p-swarm 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "275471e7c0e88ae004660866cd54f603bd8bd1f4caef541a27f50dd8640c4d4c"
-"checksum libp2p-tcp 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f9e80ad4e3535345f3d666554ce347d3100453775611c05c60786bf9a1747a10"
-"checksum libp2p-uds 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "76d329564a43da9d0e055a5b938633c4a8ceab1f59cec133fbc4647917c07341"
-"checksum libp2p-wasm-ext 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "923581c055bc4b8c5f42d4ce5ef43e52fe5216f1ea4bc26476cb8a966ce6220b"
-"checksum libp2p-websocket 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5351ca9eea122081c1c0f9323164d2918cac29b5a6bfe5054d4ba8ec9447cf42"
-"checksum libp2p-yamux 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9dac30de24ccde0e67f363d71a125c587bbe6589503f664947e9b084b68a34f1"
+"checksum libp2p 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-core 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-core-derive 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-deflate 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-dns 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-floodsub 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-gossipsub 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-identify 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-kad 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-mdns 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-mplex 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-noise 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-ping 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-plaintext 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-pnet 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-secio 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-swarm 0.16.1 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-tcp 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-uds 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-wasm-ext 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-websocket 0.16.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum libp2p-yamux 0.16.2 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
 "checksum librocksdb-sys 6.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e3b727e2dd20ec2fb7ed93f23d9fd5328a0871185485ebdaff007b47d3e27e4"
 "checksum libsecp256k1 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
 "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
@@ -3915,7 +3914,7 @@ dependencies = [
 "checksum multihash 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47fbc227f7e2b1cb701f95404579ecb2668abbdd3c7ef7a6cbb3cc0d3b236869"
 "checksum multimap 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a97fbd5d00e0e37bfb10f433af8f5aaf631e739368dc9fc28286ca81ca4948dc"
 "checksum multipart 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01"
-"checksum multistream-select 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f938ffe420493e77c8b6cbcc3f282283f68fc889c5dcbc8e51668d5f3a01ad94"
+"checksum multistream-select 0.7.0 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 "checksum nohash-hasher 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
@@ -3927,8 +3926,8 @@ dependencies = [
 "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 "checksum openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)" = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52"
 "checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
-"checksum parity-multiaddr 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f77055f9e81921a8cc7bebeb6cded3d128931d51f1e3dd6251f0770a6d431477"
-"checksum parity-multihash 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7a1cd2ba02391b81367bec529fb209019d718684fdc8ad6a712c2b536e46f775"
+"checksum parity-multiaddr 0.7.3 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
+"checksum parity-multihash 0.2.3 (git+https://github.com/koivunej/rust-libp2p.git?branch=v0.16.2-with-floodsub-opts)" = "<none>"
 "checksum parity-send-wrapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
 "checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
 "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
@@ -4103,6 +4102,6 @@ dependencies = [
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum x25519-dalek 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
-"checksum yamux 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f03098897b734bd943ab23f6aa9f98aafd72a88516deedd66f9d564c57bf2f19"
+"checksum yamux 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "84300bb493cc878f3638b981c62b4632ec1a5c52daaa3036651e8c106d3b55ea"
 "checksum zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8"
 "checksum zeroize_derive 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
diff --git a/Cargo.toml b/Cargo.toml
index 3294f11d5..7e468f440 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,3 +43,9 @@ members = [ "bitswap", "http", "examples" ]
 
 [patch.crates-io]
 ctr = { git = "https://github.com/koivunej/stream-ciphers.git", branch = "ctr128-64to128" }
+
+# these are needed for the floodsub local originated messages to be seen by subscribers
+libp2p = { git = "https://github.com/koivunej/rust-libp2p.git", branch = "v0.16.2-with-floodsub-opts" }
+libp2p-core = { git = "https://github.com/koivunej/rust-libp2p.git", branch = "v0.16.2-with-floodsub-opts" }
+libp2p-swarm = { git = "https://github.com/koivunej/rust-libp2p.git", branch = "v0.16.2-with-floodsub-opts" }
+libp2p-floodsub = { git = "https://github.com/koivunej/rust-libp2p.git", branch = "v0.16.2-with-floodsub-opts" }
diff --git a/src/p2p/pubsub.rs b/src/p2p/pubsub.rs
index 48199ffc6..52a81db17 100644
--- a/src/p2p/pubsub.rs
+++ b/src/p2p/pubsub.rs
@@ -8,7 +8,7 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use libp2p::core::{ConnectedPoint, Multiaddr, PeerId};
-use libp2p::floodsub::{Floodsub, FloodsubEvent, FloodsubMessage, Topic};
+use libp2p::floodsub::{Floodsub, FloodsubEvent, FloodsubMessage, FloodsubOptions, Topic};
 use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters, ProtocolsHandler};
 
 /// Currently a thin wrapper around Floodsub, perhaps supporting both Gossipsub and Floodsub later.
@@ -125,10 +125,12 @@ impl Pubsub {
     /// top of the floodsub.
     pub fn new(peer_id: PeerId) -> Self {
         let (tx, rx) = channel::unbounded();
+        let mut opts = FloodsubOptions::new(peer_id);
+        opts.subscribe_local_messages = true;
         Pubsub {
             streams: HashMap::new(),
             peers: HashMap::new(),
-            floodsub: Floodsub::new(peer_id),
+            floodsub: Floodsub::from_options(opts),
             unsubscriptions: (tx, rx),
         }
     }