diff --git a/elements/heat-jeos/README.md b/elements/heat-jeos/README.md
new file mode 100644
index 000000000..d8c3142de
--- /dev/null
+++ b/elements/heat-jeos/README.md
@@ -0,0 +1,3 @@
+Install the Heat JEOS "cfn" (for CloudFormation) tools to enable HEAT
+templates to make use of advanced features of HEAT such as watches and
+AWS::CloudFormation::Init
diff --git a/elements/heat-jeos/install.d/05-heat-jeos b/elements/heat-jeos/install.d/05-heat-jeos
new file mode 100755
index 000000000..ff2d906a7
--- /dev/null
+++ b/elements/heat-jeos/install.d/05-heat-jeos
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -uex
+
+CFN_TOOLS_ROOT=/opt/aws/bin # Heat hard codes this
+
+HEAT_API_SOURCE=https://github.com/heat-api/heat-jeos.git
+
+OS_ROOT=/opt/stack
+JEOS_ROOT=$OS_ROOT/heat-jeos
+
+DEBIAN_FRONTEND=noninteractive apt-get -y install git-core python-psutil
+
+mkdir -p $OS_ROOT
+git clone $HEAT_API_SOURCE $JEOS_ROOT
+cd $JEOS_ROOT
+git checkout master
+
+mkdir -p $CFN_TOOLS_ROOT
+ln -sf $JEOS_ROOT/heat_jeos/cfntools/* $CFN_TOOLS_ROOT