diff --git a/snap/bin/libvirt-wrapper b/snap/bin/libvirt-wrapper
new file mode 100755
index 0000000..c18f88a
--- /dev/null
+++ b/snap/bin/libvirt-wrapper
@@ -0,0 +1,31 @@
+#!/bin/bash
+# This script creates a writeable /etc/libvirt under
+# SNAP_COMMON as libvirt requires write access to its
+# /etc/libvirt directory.
+#
+# Local configuration can be done by removing the
+# symlink and replacing with a file instead - subsequent
+# refreshes of the snap will preserve the file.
+#
+# TODO: move to configure hook
+
+set -e
+
+export TARGET_PATH=$SNAP/etc/libvirt
+export SOURCE_PATH=$SNAP_COMMON/etc/libvirt
+
+mkdir -p $SOURCE_PATH
+
+for target in `find $TARGET_PATH -type d`; do
+    link=$(echo $target | sed -e "s|$TARGET_PATH|$SOURCE_PATH|g")
+    mkdir -p $link
+done
+
+for target in `find $TARGET_PATH -not -type d`; do
+    link=$(echo $target | sed -e "s|$TARGET_PATH|$SOURCE_PATH|g")
+    if [ -f $target ] && [ ! -f $link ]; then
+        ln -sf $target $link
+    fi
+done
+
+exec $@
diff --git a/snap/bin/sudo b/snap/bin/sudo
new file mode 100755
index 0000000..58f48f8
--- /dev/null
+++ b/snap/bin/sudo
@@ -0,0 +1,5 @@
+#!/bin/bash
+# fake sudo script - as daemons run as root use of real sudo is not required
+# strip sudo off args and re-exec command
+
+exec ${@:1}
diff --git a/snap/etc/neutron/dhcp_agent.ini b/snap/etc/neutron/dhcp_agent.ini
new file mode 100644
index 0000000..c509e82
--- /dev/null
+++ b/snap/etc/neutron/dhcp_agent.ini
@@ -0,0 +1,4 @@
+[DEFAULT]
+interface_driver = openvswitch
+dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
+enable_isolated_metadata = True
diff --git a/snap/etc/neutron/l3_agent.ini b/snap/etc/neutron/l3_agent.ini
new file mode 100644
index 0000000..015179f
--- /dev/null
+++ b/snap/etc/neutron/l3_agent.ini
@@ -0,0 +1,2 @@
+[DEFAULT]
+interface_driver = openvswitch
diff --git a/snap/etc/neutron/metadata_agent.ini b/snap/etc/neutron/metadata_agent.ini
new file mode 100644
index 0000000..e69de29
diff --git a/snap/etc/neutron/neutron.conf b/snap/etc/neutron/neutron.conf
index 939e48e..7447794 100644
--- a/snap/etc/neutron/neutron.conf
+++ b/snap/etc/neutron/neutron.conf
@@ -1,6 +1,6 @@
+# Snap provided defaults for neutron agents
 [DEFAULT]
 
-
 [AGENT]
 # Disable root_helper for snap usage
 root_helper =
diff --git a/snap/etc/neutron/plugins/ml2/openvswitch_agent.ini b/snap/etc/neutron/plugins/ml2/openvswitch_agent.ini
new file mode 100644
index 0000000..3ee456b
--- /dev/null
+++ b/snap/etc/neutron/plugins/ml2/openvswitch_agent.ini
@@ -0,0 +1 @@
+# Snap provided defaults for neutron-openvswitch-agent
diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index d5c255c..713f9bb 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -24,7 +24,53 @@ entry_points:
     binary: neutron-openvswitch-agent
     config-files:
       - "{snap}/etc/neutron/neutron.conf"
+      - "{snap}/etc/neutron/plugins/ml2/openvswitch_agent.ini"
       - "{snap_common}/etc/neutron/neutron.conf"
+      - "{snap_common}/etc/neutron/plugins/ml2/openvswitch_agent.ini"
     config-dirs:
       - "{snap_common}/etc/neutron.conf.d"
     log-file: "{snap_common}/log/neutron-openvswitch-agent.log"
+  neutron-ovs-cleanup:
+    binary: neutron-ovs-cleanup
+    config-files:
+      - "{snap}/etc/neutron/neutron.conf"
+      - "{snap_common}/etc/neutron/neutron.conf"
+    config-dirs:
+      - "{snap_common}/etc/neutron.conf.d"
+  neutron-netns-cleanup:
+    binary: neutron-netns-cleanup
+    config-files:
+      - "{snap}/etc/neutron/neutron.conf"
+      - "{snap_common}/etc/neutron/neutron.conf"
+    config-dirs:
+      - "{snap_common}/etc/neutron.conf.d"
+  neutron-l3-agent:
+    binary: neutron-l3-agent
+    config-files:
+      - "{snap}/etc/neutron/neutron.conf"
+      - "{snap}/etc/neutron/l3_agent.ini"
+      - "{snap_common}/etc/neutron/neutron.conf"
+      - "{snap_common}/etc/neutron/l3_agent.ini"
+    config-dirs:
+      - "{snap_common}/etc/neutron.conf.d"
+    log-file: "{snap_common}/log/neutron-l3-agent.log"
+  neutron-dhcp-agent:
+    binary: neutron-dhcp-agent
+    config-files:
+      - "{snap}/etc/neutron/neutron.conf"
+      - "{snap}/etc/neutron/dhcp_agent.ini"
+      - "{snap_common}/etc/neutron/neutron.conf"
+      - "{snap_common}/etc/neutron/dhcp_agent.ini"
+    config-dirs:
+      - "{snap_common}/etc/neutron.conf.d"
+    log-file: "{snap_common}/log/neutron-dhcp-agent.log"
+  neutron-metadata-agent:
+    binary: neutron-metadata-agent
+    config-files:
+      - "{snap}/etc/neutron/neutron.conf"
+      - "{snap}/etc/neutron/metadata_agent.ini"
+      - "{snap_common}/etc/neutron/neutron.conf"
+      - "{snap_common}/etc/neutron/metadata_agent.ini"
+    config-dirs:
+      - "{snap_common}/etc/neutron.conf.d"
+    log-file: "{snap_common}/log/neutron-metadata-agent.log"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 8de6452..a407d9e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -38,6 +38,43 @@ apps:
       - process-control
       - system-trace
       - system-observe
+  neutron-l3-agent:
+    command: snap-openstack neutron-l3-agent
+    daemon: simple
+    plugs:
+      - network
+      - network-control
+      - firewall-control
+      - process-control
+      - system-trace
+      - system-observe
+  neutron-dhcp-agent:
+    command: snap-openstack neutron-dhcp-agent
+    daemon: simple
+    plugs:
+      - network
+      - network-control
+      - firewall-control
+      - process-control
+      - system-trace
+      - system-observe
+  neutron-metadata-agent:
+    command: snap-openstack neutron-metadata-agent
+    daemon: simple
+    plugs:
+      - network
+      - network-bind
+      - network-control
+  neutron-ovs-cleanup:
+    command: snap-openstack neutron-ovs-cleanup
+    plugs:
+      - network
+      - network-control
+  neutron-netns-cleanup:
+    command: snap-openstack neutron-netns-cleanup
+    plugs:
+      - network
+      - network-control
   openvswitch:
     command: ovs-wrapper $SNAP/share/openvswitch/scripts/ovs-ctl start --system-id=random
     stop-command: ovs-wrapper $SNAP/share/openvswitch/scripts/ovs-ctl stop
@@ -65,7 +102,121 @@ apps:
     command: ovs-wrapper $SNAP/bin/ovs-dpctl
     plugs:
       - network
+  libvirt-bin:
+    command: libvirt-wrapper $SNAP/sbin/libvirtd
+    daemon: simple
+    plugs:
+      - network
+      - network-bind
+      - network-control
+  virtlockd:
+    command: libvirt-wrapper $SNAP/sbin/virtlockd
+    daemon: simple
+    plugs:
+      - network
+      - network-bind
+      - network-control
+  virtlogd:
+    command: libvirt-wrapper $SNAP/sbin/virtlogd
+    daemon: simple
+    plugs:
+      - network
+      - network-bind
+      - network-control
+  virsh:
+    command: bin/virsh
+    plugs:
+      - network
 parts:
+  qemu:
+    source: http://wiki.qemu-project.org/download/qemu-2.7.0.tar.bz2
+    plugin: autotools
+    build-packages:
+      - libaio-dev
+      - acpica-tools
+      - libasound2-dev
+      - libattr1-dev
+      - libcap-dev
+      - libcap-ng-dev
+      - libiscsi-dev
+      - libnuma-dev
+      - librados-dev
+      - librbd-dev
+      - libspice-server-dev
+      - libspice-protocol-dev
+      - libusb-1.0-0-dev
+      - libusbredirparser-dev
+      - zlib1g-dev
+      - uuid-dev
+    configflags:
+        - "--target-list=x86_64-softmmu i386-softmmu"
+        - "--prefix=/snap/$SNAPCRAFT_PROJECT_NAME/current"
+    organize:
+      # Hack to shift installed qemu back to root of snap
+      # required to ensure that pathing to files etc works at
+      # runtime
+      "snap/nova-hypervisor/current/*": ""
+    filesets:
+      all:
+        - -snap
+    stage: [$all]
+    snap: [$all]
+  libvirt:
+    after: [qemu]
+    source: https://libvirt.org/sources/libvirt-2.4.0.tar.xz
+    plugin: autotools
+    build-packages:
+      - libxml2-dev
+      - libcurl4-gnutls-dev
+      - libncurses5-dev
+      - libreadline-dev
+      - zlib1g-dev
+      - libgcrypt20-dev
+      - libgnutls28-dev
+      - libsasl2-dev
+      - libsanlock-dev
+      - libiscsi-dev
+      - librbd-dev
+      - librados-dev
+      - libyajl-dev
+      - libpcap0.8-dev
+      - libaudit-dev
+      - libdevmapper-dev
+      - libpciaccess-dev
+      - libnl-3-dev
+      - libnl-route-3-dev
+      - libpolkit-gobject-1-dev
+      - uuid-dev
+      - libnuma-dev
+      - python-all
+      - python-six
+    configflags:
+      - "--with-qemu"
+      - "--without-xen"
+      - "--without-openvz"
+      - "--without-vmware"
+      - "--without-xenapi"
+      - "--without-esx"
+      - "--without-hyperv"
+      - "--without-lxc"
+      - "--without-vz"
+      - "--without-vbox"
+      - "--without-uml"
+      - "--without-sasl"
+      - "--prefix=/snap/$SNAPCRAFT_PROJECT_NAME/current"
+      - "--localstatedir=/var/snap/$SNAPCRAFT_PROJECT_NAME/common/run"
+      - "--sysconfdir=/var/snap/$SNAPCRAFT_PROJECT_NAME/common/etc"
+    organize:
+      # Hack to shift installed libvirt back to root of snap
+      # required to ensure that pathing to files etc works at
+      # runtime
+      "snap/nova-hypervisor/current/*": ""
+      "var/snap/nova-hypervisor/common/*": ""
+    filesets:
+      all:
+        - -snap
+    stage: [$all]
+    snap: [$all]
   openvswitch:
     source: http://openvswitch.org/releases/openvswitch-2.6.1.tar.gz
     plugin: autotools
@@ -107,6 +258,33 @@ parts:
   templates:
     after:
       - nova
+      - qemu
+      - libvirt
       - openvswitch
     plugin: dump
     source: snap
+  config-nova:
+    after:
+      - nova
+    plugin: dump
+    source: http://tarballs.openstack.org/nova/nova-master.tar.gz
+    filesets:
+      etc:
+        - etc/nova/*
+    stage: [$etc]
+    snap: [$etc]
+  config-neutron:
+    after:
+      - nova
+    plugin: dump
+    source: http://tarballs.openstack.org/neutron/neutron-master.tar.gz
+    organize:
+      etc/*.conf: etc/neutron/
+      etc/*.ini: etc/neutron/
+      etc/*.json: etc/neutron/
+      etc/rootwrap.d/*: etc/neutron/rootwrap.d/
+    filesets:
+      etc:
+        - etc/neutron/*
+    stage: [$etc]
+    snap: [$etc]