diff --git a/CHANGES.md b/CHANGES.md
index 60f79e0..528b601 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,8 @@
 
 ### Changed
 
+- Upgrade to `cmdlang.0.0.5`.
+
 ### Deprecated
 
 ### Fixed
diff --git a/bin/dune b/bin/dune
index 198837a..e3baae6 100644
--- a/bin/dune
+++ b/bin/dune
@@ -3,6 +3,6 @@
  (public_name ocaml-vcs)
  (package vcs-command)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
- (libraries cmdlang-to-cmdliner err vcs-command)
+ (libraries cmdlang-cmdliner-runner err vcs-command)
  (instrumentation
   (backend bisect_ppx)))
diff --git a/bin/main.ml b/bin/main.ml
index 8f2b2a2..ba57eb1 100644
--- a/bin/main.ml
+++ b/bin/main.ml
@@ -20,7 +20,7 @@
 (*******************************************************************************)
 
 let () =
-  Cmdlang_to_cmdliner.run
+  Cmdlang_cmdliner_runner.run
     Vcs_command.main
     ~name:"ocaml-vcs"
     ~version:"%%VERSION%%"
diff --git a/dune-project b/dune-project
index 397a3f5..696af4b 100644
--- a/dune-project
+++ b/dune-project
@@ -77,7 +77,7 @@
     (>= v0.17)
     (< v0.18)))
   (cmdlang
-   (>= 0.0.4))
+   (>= 0.0.5))
   (eio
    (>= 1.0))
   (fpath
@@ -130,9 +130,11 @@
     (>= v0.17)
     (< v0.18)))
   (cmdlang
-   (>= 0.0.4))
+   (>= 0.0.5))
+  (cmdlang-cmdliner-runner
+   (>= 0.0.5))
   (cmdlang-to-cmdliner
-   (>= 0.0.4))
+   (>= 0.0.5))
   (cmdliner
    (= 1.3.0))
   (eio
@@ -140,7 +142,7 @@
   (eio_main
    (>= 1.0))
   (err
-   (>= 0.0.4))
+   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
@@ -361,9 +363,11 @@
     :with-dev-setup
     (>= 2.8.3)))
   (cmdlang
-   (>= 0.0.4))
+   (>= 0.0.5))
+  (cmdlang-cmdliner-runner
+   (>= 0.0.5))
   (cmdlang-to-cmdliner
-   (>= 0.0.4))
+   (>= 0.0.5))
   (cmdliner
    (= 1.3.0))
   (core
@@ -375,7 +379,7 @@
   (eio_main
    (>= 1.0))
   (err
-   (>= 0.0.4))
+   (>= 0.0.5))
   (expect_test_helpers_core
    (and
     (>= v0.17)
diff --git a/vcs-arg.opam b/vcs-arg.opam
index beeab4c..982134f 100644
--- a/vcs-arg.opam
+++ b/vcs-arg.opam
@@ -11,7 +11,7 @@ depends: [
   "dune" {>= "3.16"}
   "ocaml" {>= "5.2"}
   "base" {>= "v0.17" & < "v0.18"}
-  "cmdlang" {>= "0.0.4"}
+  "cmdlang" {>= "0.0.5"}
   "eio" {>= "1.0"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.0"}
diff --git a/vcs-command.opam b/vcs-command.opam
index 8744bdc..5ba8301 100644
--- a/vcs-command.opam
+++ b/vcs-command.opam
@@ -11,12 +11,13 @@ depends: [
   "dune" {>= "3.16"}
   "ocaml" {>= "5.2"}
   "base" {>= "v0.17" & < "v0.18"}
-  "cmdlang" {>= "0.0.4"}
-  "cmdlang-to-cmdliner" {>= "0.0.4"}
+  "cmdlang" {>= "0.0.5"}
+  "cmdlang-cmdliner-runner" {>= "0.0.5"}
+  "cmdlang-to-cmdliner" {>= "0.0.5"}
   "cmdliner" {= "1.3.0"}
   "eio" {>= "1.0"}
   "eio_main" {>= "1.0"}
-  "err" {>= "0.0.4"}
+  "err" {>= "0.0.5"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.0"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
diff --git a/vcs-tests.opam b/vcs-tests.opam
index bd7bd18..32aa217 100644
--- a/vcs-tests.opam
+++ b/vcs-tests.opam
@@ -14,13 +14,14 @@ depends: [
   "base" {>= "v0.17" & < "v0.18"}
   "base_quickcheck" {>= "v0.17" & < "v0.18"}
   "bisect_ppx" {with-dev-setup & >= "2.8.3"}
-  "cmdlang" {>= "0.0.4"}
-  "cmdlang-to-cmdliner" {>= "0.0.4"}
+  "cmdlang" {>= "0.0.5"}
+  "cmdlang-cmdliner-runner" {>= "0.0.5"}
+  "cmdlang-to-cmdliner" {>= "0.0.5"}
   "cmdliner" {= "1.3.0"}
   "core" {>= "v0.17" & < "v0.18"}
   "eio" {>= "1.0"}
   "eio_main" {>= "1.0"}
-  "err" {>= "0.0.4"}
+  "err" {>= "0.0.5"}
   "expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.0"}