diff --git a/scripts/system/dhcpdv6-config.pl b/scripts/system/dhcpdv6-config.pl
index ea3ca98..fe81419 100644
--- a/scripts/system/dhcpdv6-config.pl
+++ b/scripts/system/dhcpdv6-config.pl
@@ -191,6 +191,7 @@ my @push_arr = (
 );
 
 my @pop_arr = (
+    [ "name-server", \&write_list, "option dhcp6.name-servers" ],
     [ "shared-network-name *", \&write_cf, "}\n" ],
     [ "shared-network-name * subnet *", \&write_cf, "    }\n" ],
     [ "shared-network-name * subnet * name-server", \&write_list, 
@@ -217,6 +218,7 @@ my @pop_arr = (
 );
 
 my @leaf_arr = (
+    [ "name-server *", \&push_list, "VAR-2" ],
     [ "preference *", \&write_cf, "option dhcp6.preference VAR-2;\n" ], 
     [ "shared-network-name * subnet * name-server *", \&push_list,
       "VAR-6" ],
diff --git a/src/templates.in b/src/templates.in
index 55de017..fe894a2 100644
--- a/src/templates.in
+++ b/src/templates.in
@@ -62,6 +62,16 @@ end:
 
 ##-----------------------------------------------------------------------------
 
+file: service/dhcpv6-server/name-server/node.def
+
+multi:
+
+type: ipv6
+
+help: IPv6 address of a Recursive DNS Server
+
+##-----------------------------------------------------------------------------
+
 file: service/dhcpv6-server/preference/node.def
 
 help: Preference of this DHCPv6 server compared with others