diff --git a/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2 b/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2
new file mode 100644
index 0000000000..aab421806b
--- /dev/null
+++ b/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2
@@ -0,0 +1,11 @@
+{
+    "command": "/usr/bin/nova-spicehtml5proxy",
+    "config_files": [
+        {
+            "source": "{{ container_config_directory }}/nova.conf",
+            "dest": "/etc/nova/nova.conf",
+            "owner": "nova",
+            "perm": "0600"
+        }
+    ]
+}
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
new file mode 100644
index 0000000000..2397e68d0a
--- /dev/null
+++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
@@ -0,0 +1,18 @@
+FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+RUN echo 'ERROR: The specified distro has no Kolla images to build: "{{ base_distro }}"' \
+    && /bin/false
+
+    {% endif %}
+{% elif install_type == 'source' %}
+
+ADD nova-spicehtml5proxy-archive /usr/share/nova-spicehtml5proxy-source
+RUN cd /usr/share && ln -s nova-spicehtml5proxy-source/* spice-html5
+
+{% endif %}
+
+{{ include_footer }}
diff --git a/etc/kolla/kolla-build.conf b/etc/kolla/kolla-build.conf
index f40f5f76c2..6572ada03d 100644
--- a/etc/kolla/kolla-build.conf
+++ b/etc/kolla/kolla-build.conf
@@ -123,6 +123,14 @@ location = http://tarballs.openstack.org/neutron/neutron-master.tar.gz
 type = url
 location = http://tarballs.openstack.org/nova/nova-master.tar.gz
 
+[nova-spicehtml5proxy]
+## freedesktop.org has the latest untagged code and should be prefered for git
+# type = git
+# location = http://anongit.freedesktop.org/git/spice/spice-html5.git
+# reference = master
+type = url
+location = http://github.com/SPICE/spice-html5/tarball/spice-html5-0.1.6
+
 [nova-novncproxy]
 type = url
 location = http://github.com/kanaka/noVNC/tarball/v0.5.1