diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-qa.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-qa.yaml
new file mode 100644
index 0000000000..fb8d6c1901
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-qa.yaml
@@ -0,0 +1,23 @@
+# This is a non-standard docs job because it uses SCP instead of FTP.
+# It also uses a non standard build script.
+- job:
+    name: openstack-qa-docs
+    node: precise
+
+    triggers:
+      - zuul-post
+
+    builders:
+      - gerrit-git-prep
+      - shell: |
+          export HUDSON_PUBLISH_DOCS=1
+          python setup.py build_sphinx
+
+    publishers:
+      - scp:
+          site: '173.203.107.207'
+          files:
+            - target: 'qa'
+              source: 'build/sphinx/html/**/*'
+              keep-hierarchy: true
+      - console-log-post
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 2d438c0fef..519ff06cbb 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -426,3 +426,11 @@
     jobs:
       - python-jobs
       - gate-{name}-pyflakes
+
+
+- project:
+    name: openstack-qa
+    github-org: openstack-dev
+    node: precise
+    jobs:
+      - gate-{name}-merge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 0f86fb5c14..5328d6b0ee 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -670,3 +670,12 @@ projects:
     post:
       - images-api-v20
 
+  - name: openstack-dev/openstack-qa
+    check:
+      - gate-openstack-qa-merge
+    gate:
+      - gate-openstack-qa-merge
+    post:
+      - openstack-qa-docs
+    publish:
+      - openstack-qa-docs