diff --git a/meson.build b/meson.build
index ece2796..578625e 100644
--- a/meson.build
+++ b/meson.build
@@ -11,10 +11,18 @@
     version: '1.0.0',
 )
 
+cxx = meson.get_compiler('cpp')
+
 systemd = dependency('systemd', required : true)
 
 sdbusplus_dep = dependency('sdbusplus')
 
+if cxx.has_header('CLI/CLI.hpp')
+    CLI11_dep = declare_dependency()
+else
+    CLI11_dep = dependency('CLI11')
+endif
+
 phosphorlogging = dependency(
     'phosphor-logging',
     fallback: [
@@ -25,7 +33,6 @@
 
 realpath_prog = find_program('realpath')
 
-cxx = meson.get_compiler('cpp')
 conf_data = configuration_data()
 if get_option('hostboot-dump-collection').enabled()
     conf_data.set('WATCHDOG_DUMP_COLLECTION', true)
@@ -45,6 +52,7 @@
 
 deps = [
     systemd,
+    CLI11_dep,
     sdbusplus_dep,
     phosphorlogging,
     extra_deps
diff --git a/subprojects/CLI11.wrap b/subprojects/CLI11.wrap
new file mode 100644
index 0000000..2e5a95b
--- /dev/null
+++ b/subprojects/CLI11.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/CLIUtils/CLI11.git
+revision = HEAD
+
+[provide]
+CLI11 = CLI11_dep