diff --git a/.gitignore b/.gitignore
index ab78b7bac7..1315119761 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
 *~
 *.pyc
 applytest
-build/
-doc/html/
+doc/build/
 manifests/secrets.pp
+.tox/
+openstack_ci_puppet.egg-info/
 
diff --git a/doc/conf.py b/doc/source/conf.py
similarity index 100%
rename from doc/conf.py
rename to doc/source/conf.py
diff --git a/doc/gerrit.rst b/doc/source/gerrit.rst
similarity index 100%
rename from doc/gerrit.rst
rename to doc/source/gerrit.rst
diff --git a/doc/index.rst b/doc/source/index.rst
similarity index 100%
rename from doc/index.rst
rename to doc/source/index.rst
diff --git a/doc/jenkins.rst b/doc/source/jenkins.rst
similarity index 100%
rename from doc/jenkins.rst
rename to doc/source/jenkins.rst
diff --git a/doc/jenkins_jobs.rst b/doc/source/jenkins_jobs.rst
similarity index 100%
rename from doc/jenkins_jobs.rst
rename to doc/source/jenkins_jobs.rst
diff --git a/doc/meetbot.rst b/doc/source/meetbot.rst
similarity index 100%
rename from doc/meetbot.rst
rename to doc/source/meetbot.rst
diff --git a/doc/puppet.rst b/doc/source/puppet.rst
similarity index 100%
rename from doc/puppet.rst
rename to doc/source/puppet.rst
diff --git a/doc/puppet_modules.rst b/doc/source/puppet_modules.rst
similarity index 100%
rename from doc/puppet_modules.rst
rename to doc/source/puppet_modules.rst
diff --git a/doc/systems.rst b/doc/source/systems.rst
similarity index 100%
rename from doc/systems.rst
rename to doc/source/systems.rst
diff --git a/doc/third_party.rst b/doc/source/third_party.rst
similarity index 100%
rename from doc/third_party.rst
rename to doc/source/third_party.rst
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
index 6da9e6d6e6..b4b73da3c6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
@@ -42,3 +42,25 @@
 
     publishers:
       - console-log
+
+
+# This is a non-standard docs job because it uses SCP instead of FTP
+- job:
+    name: ci-docs
+    node: precise
+
+    triggers:
+      - zuul-post
+
+    builders:
+      - gerrit-git-prep
+      - docs
+
+    publishers:
+      - scp:
+          site: '173.203.107.207'
+          files:
+            - target: 'ci'
+              source: 'doc/build/html/**/*'
+              keep-hierarchy: true
+      - console-log-post
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 348a09679a..0f86fb5c14 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -188,6 +188,8 @@ projects:
       - gate-ci-puppet-merge:
         - gate-ci-puppet-syntax
         - gate-ci-puppet-lint
+    post:
+      - ci-docs
 
   - name: openstack-ci/puppet-apparmor
     check:
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000..11d2c44221
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,4 @@
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source
diff --git a/setup.py b/setup.py
index 27ab208d47..44095cae07 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ try:
 except Exception:
     pass
 
-setup(name='nova',
+setup(name='openstack-ci-puppet',
       version="%d.%02d" % (datetime.datetime.now().year,
                            datetime.datetime.now().month),
       description="OpenStack Continuous Integration Scripts",
diff --git a/tox.ini b/tox.ini
index a898107f9d..8c06a6429e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,3 +8,7 @@ commands = pyflakes modules setup.py
 [testenv:pep8]
 deps = pep8
 commands = pep8 --count --repeat --show-source --exclude=.tox setup.py
+
+[testenv:venv]
+commands = {posargs}
+deps = Sphinx