diff --git a/jenkins/jobs/devstack.yaml b/jenkins/jobs/devstack.yaml
new file mode 100644
index 0000000000..2be23a28b5
--- /dev/null
+++ b/jenkins/jobs/devstack.yaml
@@ -0,0 +1,38 @@
+# Devstack does not support "python setup.py publish_sphinx", thus
+# we cannot use the normal docs jobs.
+
+- job:
+    name: devstack-publish-docs
+    node: 'bare-precise || bare-trusty'
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+      - tox:
+          envlist: 'docs'
+      - zuul_swift_upload_console_log
+
+    publishers:
+      - ftp:
+          site: 'docs.openstack.org'
+          source: 'doc/build/html/**'
+          target: 'developer/devstack'
+          remove-prefix: 'docs/html'
+          excludes: ''
+      - console-log
+
+- job:
+    name: gate-devstack-publish-docs
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+      - tox:
+          envlist: 'docs'
+      - zuul_swift_upload_console_log
+
+    publishers:
+      - console-log
+      - upload-sphinx-draft
+
+    node: '{node}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1e65021396..9879f42dd9 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -799,6 +799,8 @@ jobs:
     voting: false
   - name: gate-kolla-bashate
     voting: false
+  - name: gate-devstack-publish-docs
+    voting: false
 
 # The project list is grouped by type of project, and within each
 # group, projects are sorted (mostly) alphabetically.
@@ -2810,6 +2812,7 @@ projects:
       - check-tempest-dsvm-ironic-pxe_ssh-nv
       - check-tempest-dsvm-ironic-pxe_ssh-postgres-nv
       - check-tempest-dsvm-f20
+      - gate-devstack-publish-docs
     gate:
       - gate-devstack-bashate
       - gate-devstack-dsvm-cells
@@ -2817,6 +2820,8 @@ projects:
       - gate-grenade-dsvm-partial-ncpu
       - gate-neutron-dsvm-functional
       - gate-swift-dsvm-functional
+    post:
+      - devstack-publish-docs
     experimental:
       - check-tempest-dsvm-cells-full
       - check-tempest-dsvm-zaqar