Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 13735)
+++ tools/gformat.py	(revision 13761)
@@ -500,8 +500,12 @@
 def generate_dhcpd_conf(datadump):
   """ Generate config file '/usr/local/etc/dhcpd.conf """
+  # Redundency support, in cause local DNS server is not running/responding.
+  datadump['autogen_domain_name_servers'] = [datadump['masterip']] + [x[1] for x in get_neighbours(datadump)]
   output = generate_header(datadump)
   output += Template("""\
 # option definitions common to all supported networks...
 option domain-name "dhcp.{{ autogen_fqdn }}";
+
+option domain-name-servers {{ autogen_domain_name_servers|join(", ") }};
 
 default-lease-time 600;
@@ -576,5 +580,4 @@
         range %(autogen_dhcp_start)s %(autogen_dhcp_stop)s;
         option routers %(autogen_addr)s;
-        option domain-name-servers %(autogen_addr)s;
       }
       """ % datadump[iface_key]))