diff --git a/files/dhcpd.hosts b/files/dhcpd.hosts
index 835da14..359e5b1 100644
--- a/files/dhcpd.hosts
+++ b/files/dhcpd.hosts
@@ -5,7 +5,9 @@
 host {{ host_name }} {
   hardware ethernet {{ host.mac }};
   fixed-address {{ host.address }};
+  {%- if host.hostname is defined %}
   ddns-hostname "{{ host.hostname }}";
+  {%- endif %}
 }
 
 {%- endfor %}
diff --git a/files/dhcpd.subnets b/files/dhcpd.subnets
index 6160b2b..2e46c1a 100644
--- a/files/dhcpd.subnets
+++ b/files/dhcpd.subnets
@@ -4,6 +4,7 @@
   {%- if subnet.range is defined %}
   pool
   {
+	#failover peer "dhcp-failover";
     range {{ subnet.range }};
   }
   {%- endif %}