diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7c72ba79..63a342fd 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -13,7 +13,9 @@
 # serve to show the default.
 
 import datetime
+import os.path
 import subprocess
+import sys
 
 # make openstackdocstheme an optional dependency. cliff is a low level lib
 # that is used outside of OpenStack. Not having something OpenStack specific
@@ -28,7 +30,10 @@ else:
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+
+# NOTE(dhellmann): Add the demoapp directory to the import path so the
+# directive for documenting the app can find the modules.
+sys.path.insert(0, os.path.abspath('../../demoapp'))
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/setup.cfg b/setup.cfg
index e451bfba..19904b07 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -50,6 +50,21 @@ cliff.formatter.completion =
     bash = cliff.complete:CompleteBash
     none = cliff.complete:CompleteNoCode
 
+# NOTE(dhellmann): Duplicated from demoapp/setup.py for the
+# documentation build.
+cliff.demo =
+    simple = cliffdemo.simple:Simple
+    two_part = cliffdemo.simple:Simple
+    error = cliffdemo.simple:Error
+    list files = cliffdemo.list:Files
+    files = cliffdemo.list:Files
+    file = cliffdemo.show:File
+    show file = cliffdemo.show:File
+    unicode = cliffdemo.encoding:Encoding
+    hooked = cliffdemo.hook:Hooked
+cliff.demo.hooked =
+    sample-hook = cliffdemo.hook:Hook
+
 
 [build_sphinx]
 all-files = 1
diff --git a/tox.ini b/tox.ini
index 21aacea4..929d28f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,6 @@ commands =
   coverage report --show-missing
 deps =
   -r{toxinidir}/test-requirements.txt
-  {toxinidir}/demoapp
   .[docs]
 
 [testenv:pep8]