diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl
index 6785bc580492e343d280176013a770c8d88f47bb..5831fc20d791df225776b9a880c87a3be45d9326 100755
--- a/dist/share/configs/cellframe-node.cfg.tpl
+++ b/dist/share/configs/cellframe-node.cfg.tpl
@@ -1,4 +1,4 @@
-# General section
+# General section
 [general]
 debug_mode={DEBUG_MODE}
 debug_dump_stream_headers={DEBUG_STREAM_HEADERS}
@@ -17,7 +17,10 @@ node_addr_type=auto
 enabled={SERVER_ENABLED}
 listen_address={SERVER_ADDR}
 listen_port_tcp={SERVER_PORT}
-builtin_dns_enabled=true #{BUILTIN_DNS_ENABLED}
+
+# Builtin DNS server
+[builtin_dns]
+enabled=true
 
 # Mempool
 [mempool]
diff --git a/libdap-server-udp b/libdap-server-udp
index 7500d54e139a92586b1488edffcb12f4f1c824ec..e50b808e141633ecae5492f49f5cc1b694823624 160000
--- a/libdap-server-udp
+++ b/libdap-server-udp
@@ -1 +1 @@
-Subproject commit 7500d54e139a92586b1488edffcb12f4f1c824ec
+Subproject commit e50b808e141633ecae5492f49f5cc1b694823624
diff --git a/sources/main.c b/sources/main.c
index 9485dcdf0fa0deda7d5d8e35c66fe558a481d91a..4f66eeca7e1c003b0fae649143c5367fcfb572f3 100755
--- a/sources/main.c
+++ b/sources/main.c
@@ -421,7 +421,7 @@ int main( int argc, const char **argv )
 
 
     // DNS server start
-    bool bBuiltinDNSEnabled = dap_config_get_item_bool_default(g_config, "server", "builtin_dns_enabled", false);
+    bool bBuiltinDNSEnabled = dap_config_get_item_bool_default(g_config, "builtin_dns", "enabled", false);
     log_it(L_DEBUG, "config server->builtin_dns_enabled = \"%u\" ", bBuiltinDNSEnabled);
     dap_server_t *dns = NULL;
     if (bBuiltinDNSEnabled) {