diff --git a/gerrit/acls/openstack/fairy-slipper.config b/gerrit/acls/openstack/fairy-slipper.config
new file mode 100644
index 0000000000..7d407e1569
--- /dev/null
+++ b/gerrit/acls/openstack/fairy-slipper.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group fairy-slipper-core
+label-Code-Review = -2..+2 group fairy-slipper-core
+label-Workflow = -1..+1 group fairy-slipper-core
+
+[access "refs/tags/*"]
+pushSignedTag = group library-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index de7f6e2231..0a7028c2f0 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1134,6 +1134,11 @@
   acl-config: /home/gerrit2/acls/openstack/evoque.config
 - project: openstack/faafo
   description: First App Application for OpenStack
+- project: openstack/fairy-slipper
+  description: API documentation generator and builder for OpenStack
+  upstream: https://github.com/russell/fairy-slipper
+  groups:
+     - openstack-api-site
 - project: openstack/flame
   description: Automatic Heat template generation
 - project: openstack/freezer
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 29a34f6d21..7b296f3ed2 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -472,6 +472,7 @@ openstack-doc:
     - openstack/api-site
     - openstack/clouddocs-maven-plugin
     - openstack/docs-specs
+    - openstack/fairy-slipper
     - openstack/ha-guide
     - openstack/openstack-doc-tools
     - openstack/openstack-manuals
@@ -1492,6 +1493,7 @@ openstack-sdks:
   projects:
     - openstack/api-wg
     - openstack/cliff
+    - openstack/fairy-slipper
     - openstack/golang-client
     - openstack/keystoneauth
     - openstack/os-client-config
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index d15fb30bbf..b6ed293232 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1352,6 +1352,15 @@
       - gate-{name}-docs
       - gate-{name}-pep8
 
+- project:
+    name: fairy-slipper
+    node: bare-trusty
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: flame
     node: bare-trusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bfd34f5e9e..7ba1d92ea1 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4742,6 +4742,13 @@ projects:
       - gate-faafo-docs
       - gate-faafo-pep8
 
+  - name: openstack/fairy-slipper
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: python3-jobs
+      - name: publish-to-pypi
+
   - name: openstack/flame
     template:
     - name: merge-check