diff --git a/manifests/site.pp b/manifests/site.pp
index f0fbb70865..9cda99db71 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -308,6 +308,8 @@ node "jenkins.openstack.org" {
       'devstack',
       'devstack-gate',
       'gerrit',
+      'gerritbot',
+      'gerritlib',
       'gerrit-verification-status-plugin',
       'glance',
       'horizon',
diff --git a/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml b/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml
new file mode 100644
index 0000000000..21d411db8b
--- /dev/null
+++ b/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml
@@ -0,0 +1,85 @@
+---
+# pyflakes-gate
+main:
+  name: 'gate-gerritbot-pyflakes'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack-ci'
+  project: 'gerritbot'
+  concurrent: 'true'
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - pyflakes
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'precise'
+
+---
+# pep8-gate
+main:
+  name: 'gate-gerritbot-pep8'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack-ci'
+  project: 'gerritbot'
+  concurrent: 'true'
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - pep8
+
+post_build_actions:
+  - pep8
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'precise'
+
+---
+# merge-gate
+main:
+  name: 'gate-gerritbot-merge'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack-ci'
+  project: 'gerritbot'
+  concurrent: 'true'
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'precise'
diff --git a/modules/jenkins_jobs/files/projects/openstack/gerritlib.yml b/modules/jenkins_jobs/files/projects/openstack/gerritlib.yml
new file mode 100644
index 0000000000..23660f72f5
--- /dev/null
+++ b/modules/jenkins_jobs/files/projects/openstack/gerritlib.yml
@@ -0,0 +1,113 @@
+---
+# pyflakes-gate
+main:
+  name: 'gate-gerritlib-pyflakes'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack-ci'
+  project: 'gerritlib'
+  concurrent: 'true'
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - pyflakes
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'precise'
+
+---
+# pep8-gate
+main:
+  name: 'gate-gerritlib-pep8'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack-ci'
+  project: 'gerritlib'
+  concurrent: 'true'
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - pep8
+
+post_build_actions:
+  - pep8
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'precise'
+
+---
+# merge-gate
+main:
+  name: 'gate-gerritlib-merge'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack-ci'
+  project: 'gerritlib'
+  concurrent: 'true'
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'precise'
+
+---
+# pypi-upload
+main:
+  name: 'gerritlib-pypi'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack-ci'
+  project: 'gerritlib'
+  concurrent: 'true'
+
+triggers:
+  - zuul_post
+
+builders:
+  - gerrit_git_prep
+  - shell: tox -v -evenv python setup.py sdist upload
+
+post_build_actions:
+  - tarball:
+      site: 'nova.openstack.org'
+      project: 'ci'
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'pypi'
+
diff --git a/modules/openstack-ci-config/files/zuul/layout.yaml b/modules/openstack-ci-config/files/zuul/layout.yaml
index 2a20f96f76..e9a3603d86 100644
--- a/modules/openstack-ci-config/files/zuul/layout.yaml
+++ b/modules/openstack-ci-config/files/zuul/layout.yaml
@@ -78,6 +78,28 @@ projects:
     post:
       - gerrit-package
 
+  - name: openstack-ci/gerritbot
+    check:
+      - gate-gerritbot-merge:
+        - gate-gerritbot-pep8
+        - gate-gerritbot-pyflakes
+    gate:
+      - gate-gerritbot-merge:
+        - gate-gerritbot-pep8
+        - gate-gerritbot-pyflakes
+
+  - name: openstack-ci/gerritlib
+    check:
+      - gate-gerritlib-merge:
+        - gate-gerritlib-pep8
+        - gate-gerritlib-pyflakes
+    gate:
+      - gate-gerritlib-merge:
+        - gate-gerritlib-pep8
+        - gate-gerritlib-pyflakes
+    publish:
+      - gerritlib-pypi
+
   - name: openstack-ci/gerrit-verification-status-plugin
     check:
       - gate-gerrit-verification-status-plugin-merge