diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/nova-compute/nova-libvirt/Dockerfile
index b5b70b1e20..a37d97cff3 100644
--- a/docker/nova-compute/nova-libvirt/Dockerfile
+++ b/docker/nova-compute/nova-libvirt/Dockerfile
@@ -1,8 +1,20 @@
 FROM kollaglue/fedora-rdo-base
 MAINTAINER Steven Dake <sdake@redhat.com>
 
-RUN yum -y install libvirt \
-        libvirt-daemon-kvm && yum clean all
+RUN yum -y install libvirt-daemon-driver-* libvirt-daemon libvirt-daemon-kvm qemu-kvm && yum clean all
+
+EXPOSE 16509
+
+RUN echo "listen_tls = 0" >> /etc/libvirt/libvirtd.conf; \
+echo 'listen_tcp = 1' >> /etc/libvirt/libvirtd.conf; \
+echo 'tls_port = "16514"' >> /etc/libvirt/libvirtd.conf; \
+echo 'tcp_port = "16509"' >> /etc/libvirt/libvirtd.conf; \
+echo 'auth_tcp = "none"' >> /etc/libvirt/libvirtd.conf
+
+RUN echo 'LIBVIRTD_ARGS="--listen"' >> /etc/sysconfig/libvirtd
+RUN mkdir -p /var/lib/libvirt/images/
+
+VOLUME [ "/sys/fs/cgroup" ]
 
 ADD ./start.sh /start.sh
 CMD ["/start.sh"]
diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/nova-compute/nova-libvirt/start.sh
index 0fe90e1a41..64785da7d5 100644
--- a/docker/nova-compute/nova-libvirt/start.sh
+++ b/docker/nova-compute/nova-libvirt/start.sh
@@ -1,2 +1,13 @@
 #!/bin/sh
-# placeholder for libvirt startup script
+/bin/chmod 666 /dev/kvm
+
+echo "Starting guests."
+/usr/libexec/libvirt-guests.sh start
+
+echo "Starting virtlockd."
+/usr/sbin/virtlockd &
+
+sleep 3
+
+echo "Starting libvirtd."
+exec /usr/sbin/libvirtd --listen