Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 10731)
+++ /tools/gformat.py	(revision 10732)
@@ -122,5 +122,5 @@
 
   dhcp_interfaces = [datadump[key]['autogen_ifname'] for key in datadump['autogen_iface_keys'] if datadump[key]['dhcp']]
-  datadump['autogen_dhcp_interfaces'] = ','.join(dhcp_interfaces)
+  datadump['autogen_dhcp_interfaces'] = dhcp_interfaces
   datadump['autogen_item'] = item
 
@@ -593,5 +593,8 @@
     dnsmasq_enable="NO"
     named_enable="YES"
+    {% if autogen_dhcp_interfaces -%}
     dhcpd_enable="YES"
+    dhcpd_flags="$dhcpd_flags {{ autogen_dhcp_interfaces|join(' ') }}"
+    {% endif -%}
   {% endif -%}
 
@@ -609,5 +612,5 @@
 list_normal_proxies="{{ autogen_normal_proxies_ips }}"
 
-captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
+captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',') }}"
 
 lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z $list_ileiden_proxies"