diff --git a/dhcpd/files/dhcpd.conf b/dhcpd/files/dhcpd.conf
index 4c5e672..18af309 100644
--- a/dhcpd/files/dhcpd.conf
+++ b/dhcpd/files/dhcpd.conf
@@ -241,7 +241,11 @@ host {{ host }} {
   hardware {{ config.hardware }};
   {%- endif %}
   {%- if config.has_key('fixed_address') %}
+    {%- if config.fixed_address|is_list %}
+  fixed-address {{ config.fixed_address|join(',') }};
+    {%- else %}
   fixed-address {{ config.fixed_address }};
+    {%- endif %}
   {%- endif %}
   {%- if config.has_key('filename') %}
   filename "{{ config.filename }}";