diff --git a/Cargo.lock b/Cargo.lock
index 9a95262f68..92e455cb1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -610,8 +610,7 @@ dependencies = [
 [[package]]
 name = "clap"
 version = "3.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
+source = "git+https://github.com/crepererum/clap.git?branch=crepererum/issue4418#6ca8aca7ba656f06358440e95ada08019073e1a5"
 dependencies = [
  "bitflags",
  "clap_lex 0.2.4",
@@ -676,8 +675,7 @@ dependencies = [
 [[package]]
 name = "clap_lex"
 version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+source = "git+https://github.com/crepererum/clap.git?branch=crepererum/issue4418#6ca8aca7ba656f06358440e95ada08019073e1a5"
 dependencies = [
  "os_str_bytes",
 ]
@@ -5089,9 +5087,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
diff --git a/Cargo.toml b/Cargo.toml
index d339a8d499..c695314888 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -126,3 +126,7 @@ opt-level = 3
 
 [profile.dev.package.similar]
 opt-level = 3
+
+[patch.crates-io]
+# See https://github.com/clap-rs/clap/issues/4418
+clap3 = { git = "https://github.com/crepererum/clap.git", branch = "crepererum/issue4418", package = "clap" }