diff --git a/salt/dhcp/dhcpd.conf b/salt/dhcp/dhcpd.conf
index 153468a..3a1efea 100644
--- a/salt/dhcp/dhcpd.conf
+++ b/salt/dhcp/dhcpd.conf
@@ -1,10 +1,10 @@
 {%- import_yaml "netmasks.yaml" as netmasks -%}
-
 {%- for iface, ips in salt['grains.get']('ip_interfaces').items() %}
 {%-   if iface not in ['core', 'lo'] and pillar['subnets-inet'].get(iface) %}
+group {
 {%- set conf = pillar['dhcp'][iface] %}
 {%- set subnet = pillar['subnets-inet'][iface] %}
-subnet {{ subnet.split('/')[0] }} netmask {{ netmasks[subnet.split('/')[1]] }} {
+  subnet {{ subnet.split('/')[0] }} netmask {{ netmasks[subnet.split('/')[1]] }} {
     authoritative;
     default-lease-time {{ conf['time'] }};
     max-lease-time {{ conf['max-time'] }};
@@ -24,6 +24,12 @@ subnet {{ subnet.split('/')[0] }} netmask {{ netmasks[subnet.split('/')[1]] }} {
 {%-     for name, value in (conf.get('string-opts') or {}).items() %}
     option {{ name }} "{{ value }}";
 {%-     endfor %}
+  }
+
+{%-     for addr, hwaddr in (conf.get('fixed-hosts') or {}).items() %}
+  host {{ addr }} { hardware ethernet {{ hwaddr }}; }
+{%-     endfor %}
+
 }
 {%-   endif %}
 {%- endfor %}