diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 0eb0e929ce..9e41b9e9be 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -157,6 +157,7 @@ heat:
       - openstack/python-heatclient
       - openstack/heat-cfntools
       - openstack/heat-templates
+      - openstack-dev/heat-cfnclient
     branches:
       - master
 
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config
new file mode 100644
index 0000000000..e545abcf78
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config
@@ -0,0 +1,16 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group heat-core
+        label-Approved = +0..+1 group heat-core
+[access "refs/heads/milestone-proposed"]
+        label-Code-Review = -2..+2 group heat-milestone
+        label-Approved = +0..+1 group heat-milestone
+[access "refs/tags/*"]
+        create = group heat-ptl
+        pushTag = group heat-ptl
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
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 9f12f2add9..488819a9ff 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -341,6 +341,16 @@
       - pypi-jobs
 
 
+- project:
+    name: heat-cfnclient
+    github-org: openstack-dev
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+
+
 - project:
     name: horizon
     github-org: openstack
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index daae24a9cc..23cc4c9ca9 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1520,6 +1520,16 @@ projects:
           - post-mirror-python33
       - heat-cfntools-docs
 
+  - name: openstack-dev/heat-cfnclient
+    check:
+      - gate-heat-cfnclient-pep8
+      - gate-heat-cfnclient-python26
+      - gate-heat-cfnclient-python27
+    gate:
+      - gate-heat-cfnclient-pep8
+      - gate-heat-cfnclient-python26
+      - gate-heat-cfnclient-python27
+
   - name: openstack/heat-templates
     check:
       - gate-noop
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 968e38308b..9334389be2 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -355,5 +355,8 @@
 - project: stackforge/python-ipmi
   description: A Pure python IPMI library
   upstream: git://git.code.sf.net/p/xcat/python-ipmi
+- project: openstack-dev/heat-cfnclient
+  description: CloudFormation compatibile Heat client
+  upstream: git://github.com/steveb/heat-cfnclient.git
 - project: stackforge/pycadf
   description: CADF Python module