diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index c74e4323b3..8e9151244e 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -259,6 +259,7 @@ openstack-mistral:
       - x-vrif-minus-2
     projects:
       - stackforge/mistral
+      - stackforge/mistral-extra
       - stackforge/python-mistralclient
     branches:
       - master
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 40a42f8b09..f4966bf4fc 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -22,6 +22,16 @@
       - python-jobs
       - pypi-jobs
 
+- project:
+    name: mistral-extra
+    github-org: stackforge
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: python-mistralclient
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 4b61b15c33..159f85229e 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -413,6 +413,8 @@ jobs:
     voting: false
   - name: gate-mistral-python33
     voting: false
+  - name: gate-mistral-extra-python33
+    voting: false
   - name: gate-python-mistralclient-python33
     voting: false
   - name: gate-murano-metadataclient-python33
@@ -3125,6 +3127,29 @@ projects:
           - post-mirror-python27
           - post-mirror-python33
 
+  - name: stackforge/mistral-extra
+    check:
+      - gate-mistral-extra-pep8
+      - gate-mistral-extra-python26
+      - gate-mistral-extra-python27
+      - gate-mistral-extra-python33
+      - gate-mistral-extra-docs
+    gate:
+      - gate-mistral-extra-pep8
+      - gate-mistral-extra-python26
+      - gate-mistral-extra-python27
+      - gate-mistral-extra-docs
+    post:
+      - mistral-extra-branch-tarball
+    pre-release:
+      - mistral-extra-tarball
+    release:
+      - mistral-extra-tarball:
+        - mistral-extra-pypi-upload:
+          - post-mirror-python26
+          - post-mirror-python27
+          - post-mirror-python33
+
   - name: stackforge/python-mistralclient
     check:
       - gate-python-mistralclient-pep8
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index e6028ba0d7..368356413c 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -452,6 +452,11 @@
   description: Task orchestration service for OpenStack cloud.
   upstream: git://github.com/rakhmerov/mistral.git
   acl-config: /home/gerrit2/acls/stackforge/mistral.config
+- project: stackforge/mistral-extra
+  description: Additional tools and examples for Mistral workflow engine.
+  launchpad: mistral
+  upstream: git://github.com/rakhmerov/mistral-extra.git
+  acl-config: /home/gerrit2/acls/stackforge/mistral.config
 - project: stackforge/MRaaS
 - project: stackforge/murano-agent
   launchpad: murano