diff --git a/src/CLI.cpp b/src/CLI.cpp
index 921db892d..855ca9f65 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <iostream>
 #include <Context.h>
 #include <CLI.h>
 #include <i18n.h>
@@ -92,3 +93,20 @@ void CLI::extractOverrides ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+void CLI::dump (const std::string& label) const
+{
+  std::cout << "# " << label << "\n"
+            << "#   _program '" << _program << "'\n";
+
+  std::vector <std::string>::const_iterator i;
+  for (i = _args.begin (); i != _args.end (); ++i)
+    std::cout << "#   _args '" << *i << "'\n";
+
+  std::cout << "#   _rc '" << _rc << "'\n";
+
+  std::map <std::string, std::string>::const_iterator m;
+  for (m = _overrides.begin (); m != _overrides.end (); ++m)
+    std::cout << "#  _overrides '" << m->first << "' --> '" << m->second << "'\n";
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/CLI.h b/src/CLI.h
index f07379d1a..f56ccf84b 100644
--- a/src/CLI.h
+++ b/src/CLI.h
@@ -41,6 +41,7 @@ public:
 
 private:
   void extractOverrides ();
+  void dump (const std::string&) const;
 
 public:
   std::multimap <std::string, std::string> _entities;