diff --git a/doc/source/cli/index.rst b/doc/source/cli/index.rst
new file mode 100644
index 00000000..d62ca4a3
--- /dev/null
+++ b/doc/source/cli/index.rst
@@ -0,0 +1,47 @@
+Designate OpenStack Client Command Reference
+============================================
+
+List of released CLI commands available in OpenStack client. These commands
+can be referenced by doing ``openstack help <command>``.
+
+========================
+Managing the DNS Service
+========================
+
+.. autoprogram-cliff:: openstack.dns.v2
+    :command: dns *
+
+===============
+Pointer Records
+===============
+
+.. autoprogram-cliff:: openstack.dns.v2
+    :command: ptr *
+
+===========
+Record Sets
+===========
+
+.. autoprogram-cliff:: openstack.dns.v2
+    :command: recordset *
+
+=================
+Top Level Domains
+=================
+
+.. autoprogram-cliff:: openstack.dns.v2
+    :command: tld *
+
+==========================
+Transaction Signature Keys
+==========================
+
+.. autoprogram-cliff:: openstack.dns.v2
+    :command: tsigkey *
+
+==============
+Managing Zones
+==============
+
+.. autoprogram-cliff:: openstack.dns.v2
+    :command: zone *
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 2f483c05..31c3b653 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -10,7 +10,8 @@ extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.viewcode',
     'sphinxcontrib.apidoc',
-    'openstackdocstheme']
+    'openstackdocstheme',
+    'cliff.sphinxext']
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/python-designateclient'
diff --git a/doc/source/index.rst b/doc/source/index.rst
index a4aa7c39..668ad496 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -20,6 +20,7 @@ API in order to use the client.
 
    install/index
    user/index
+   cli/index
    contributor/index
    reference/index
 
diff --git a/doc/source/reference/index.rst b/doc/source/reference/index.rst
index a2def4e1..8a428b3b 100644
--- a/doc/source/reference/index.rst
+++ b/doc/source/reference/index.rst
@@ -1,6 +1,6 @@
-==================================
- python-designateclient Reference
-==================================
+========================================
+python-designateclient Package Reference
+========================================
 
 .. toctree::
    :maxdepth: 4