diff --git a/Cargo.lock b/Cargo.lock
index 5242917c02..4b7234b2f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -308,6 +308,7 @@ dependencies = [
  "atty",
  "bitflags",
  "strsim 0.8.0",
+ "term_size",
  "textwrap",
  "unicode-width",
  "vec_map",
@@ -2398,12 +2399,23 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "term_size"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
+ "term_size",
  "unicode-width",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 92de5b2882..339dce1f7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ no-self-update = []
 anyhow = "1.0.31"
 cfg-if = "1.0"
 chrono = "0.4"
-clap = "2"
+clap = {version = "2", features = ["wrap_help"]}
 download = {path = "download", default-features = false}
 effective-limits = "0.5.3"
 enum-map = "2.0.3"