diff --git a/Cargo.lock b/Cargo.lock
index 27525af..5a6f626 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -444,9 +444,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.0.0-beta.4"
+version = "3.0.0-beta.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406"
+checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
 dependencies = [
  "atty",
  "bitflags",
@@ -457,14 +457,14 @@ dependencies = [
  "strsim",
  "termcolor",
  "textwrap",
- "vec_map",
+ "unicase",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0-beta.4"
+version = "3.0.0-beta.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac"
+checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -1737,9 +1737,12 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "os_str_bytes"
-version = "3.1.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
+checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "output_vt100"
@@ -3488,6 +3491,15 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
 
+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.6"
@@ -3577,12 +3589,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "vergen"
 version = "5.1.16"
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index b9c0056..fa190a4 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -11,7 +11,7 @@ bdk = { version = "0.12", default-features = false, features = ["sqlite", "elect
 bytes = "1"
 cfd_protocol = { path = "../cfd_protocol" }
 chrono = { version = "0.4", features = ["serde"] }
-clap = "3.0.0-beta.4"
+clap = "3.0.0-beta.5"
 futures = { version = "0.3", default-features = false }
 hex = "0.4"
 hkdf = "0.11"
diff --git a/daemon/src/maker.rs b/daemon/src/maker.rs
index 32aad62..325c856 100644
--- a/daemon/src/maker.rs
+++ b/daemon/src/maker.rs
@@ -1,7 +1,7 @@
 use anyhow::{Context, Result};
 use bdk::bitcoin;
 use bdk::bitcoin::secp256k1::schnorrsig;
-use clap::Clap;
+use clap::Parser;
 use daemon::auth::{self, MAKER_USERNAME};
 use daemon::db::{self};
 
@@ -29,7 +29,7 @@ use xtra::Actor;
 
 mod routes_maker;
 
-#[derive(Clap)]
+#[derive(Parser)]
 struct Opts {
     /// The port to listen on for p2p connections.
     #[clap(long, default_value = "9999")]
@@ -59,7 +59,7 @@ struct Opts {
     network: Network,
 }
 
-#[derive(Clap)]
+#[derive(Parser)]
 enum Network {
     /// Run on mainnet.
     Mainnet {
diff --git a/daemon/src/taker.rs b/daemon/src/taker.rs
index 8b63f06..a8a85e8 100644
--- a/daemon/src/taker.rs
+++ b/daemon/src/taker.rs
@@ -1,7 +1,7 @@
 use anyhow::{Context, Result};
 use bdk::bitcoin;
 use bdk::bitcoin::secp256k1::schnorrsig;
-use clap::Clap;
+use clap::Parser;
 use daemon::db::{self};
 
 use daemon::model::WalletInfo;
@@ -29,7 +29,7 @@ mod routes_taker;
 
 pub const ANNOUNCEMENT_LOOKAHEAD: time::Duration = time::Duration::hours(24);
 
-#[derive(Clap)]
+#[derive(Parser)]
 struct Opts {
     /// The IP address of the other party (i.e. the maker).
     #[clap(long, default_value = "127.0.0.1:9999")]
@@ -55,7 +55,7 @@ struct Opts {
     network: Network,
 }
 
-#[derive(Clap)]
+#[derive(Parser)]
 enum Network {
     Mainnet {
         /// URL to the electrum backend to use for the wallet.