diff --git a/elements/neutron-dhcp-agent/README.md b/elements/neutron-dhcp-agent/README.md
new file mode 100644
index 000000000..3c4ddebb5
--- /dev/null
+++ b/elements/neutron-dhcp-agent/README.md
@@ -0,0 +1,7 @@
+Install the Neutron DHCP agent.
+
+Configuration
+-------------
+
+No DHCP specific configuration exists. See the neutron-openvswitch-agent
+element for configuration parameters.
diff --git a/elements/neutron-dhcp-agent/element-deps b/elements/neutron-dhcp-agent/element-deps
new file mode 100644
index 000000000..ed0d34d2d
--- /dev/null
+++ b/elements/neutron-dhcp-agent/element-deps
@@ -0,0 +1,3 @@
+neutron
+neutron-openvswitch-agent
+os-refresh-config
diff --git a/elements/neutron-dhcp-agent/install.d/80-neutron-dhcp-agent b/elements/neutron-dhcp-agent/install.d/80-neutron-dhcp-agent
new file mode 100755
index 000000000..fb6cede2a
--- /dev/null
+++ b/elements/neutron-dhcp-agent/install.d/80-neutron-dhcp-agent
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -eux
+
+os-svc-daemon -n neutron-dhcp-agent -u neutron -c neutron-dhcp-agent -- --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron
diff --git a/elements/neutron-dhcp-agent/os-refresh-config/post-configure.d/80-neutron-dhcp-agent b/elements/neutron-dhcp-agent/os-refresh-config/post-configure.d/80-neutron-dhcp-agent
new file mode 100755
index 000000000..39383da56
--- /dev/null
+++ b/elements/neutron-dhcp-agent/os-refresh-config/post-configure.d/80-neutron-dhcp-agent
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -eux
+
+service neutron-dhcp-agent restart
diff --git a/elements/neutron-network-node/element-deps b/elements/neutron-network-node/element-deps
index 663b89ca9..9a31439c8 100644
--- a/elements/neutron-network-node/element-deps
+++ b/elements/neutron-network-node/element-deps
@@ -1,2 +1,4 @@
 neutron
+neutron-dhcp-agent
 neutron-openvswitch-agent
+os-refresh-config
diff --git a/elements/neutron-network-node/install.d/80-neutron-networking b/elements/neutron-network-node/install.d/80-neutron-networking
index 0af5d16fb..d8777c5d9 100755
--- a/elements/neutron-network-node/install.d/80-neutron-networking
+++ b/elements/neutron-network-node/install.d/80-neutron-networking
@@ -2,7 +2,6 @@
 set -eux
 
 os-svc-daemon -n neutron-l3-agent -u neutron -c neutron-l3-agent -- --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron
-os-svc-daemon -n neutron-dhcp-agent -u neutron -c neutron-dhcp-agent -- --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron
 os-svc-daemon -n neutron-metadata-agent -u neutron -c neutron-metadata-agent -- --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron
 
 # This has to be on the path of the agent that runs it http://pad.lv/1182704
diff --git a/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking b/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
index 819cb22b4..764103eb4 100755
--- a/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
+++ b/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
@@ -3,4 +3,3 @@ set -eux
 
 service neutron-metadata-agent restart
 service neutron-l3-agent restart
-service neutron-dhcp-agent restart