=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
--- debian/maas-dhcp.maas-dhcpd.service	2016-02-16 20:10:08 +0000
+++ debian/maas-dhcp.maas-dhcpd.service	2016-03-12 03:04:33 +0000
@@ -9,6 +9,10 @@
 ConditionPathExists=/var/lib/maas/dhcpd-interfaces
 
 [Service]
+# Kill the DHCP server with SIGKILL. Without this dhcpd can take a very long
+# time to stop, which prevents the quick reload of the dhcpd.conf that MAAS
+# requires.
+KillMode=SIGKILL
 # Allow dhcp server to write lease and pid file as 'dhcpd' user
 ExecStartPre=/bin/mkdir -p /run/maas/dhcp
 ExecStartPre=/bin/chown root:root /run/maas/dhcp

=== modified file 'debian/maas-dhcp.maas-dhcpd6.service'
--- debian/maas-dhcp.maas-dhcpd6.service	2016-02-16 20:10:08 +0000
+++ debian/maas-dhcp.maas-dhcpd6.service	2016-03-12 03:04:33 +0000
@@ -9,6 +9,10 @@
 ConditionPathExists=/var/lib/maas/dhcpd-interfaces
 
 [Service]
+# Kill the DHCP server with SIGKILL. Without this dhcpd can take a very long
+# time to stop, which prevents the quick reload of the dhcpd6.conf that MAAS
+# requires.
+KillMode=SIGKILL
 # Allow dhcp server to write lease and pid file as 'dhcpd' user
 ExecStartPre=/bin/mkdir -p /run/maas/dhcp
 ExecStartPre=/bin/chown root:root /run/maas/dhcp