diff --git a/package/gluon-wan-dnsmasq/files/etc/config/gluon-wan-dnsmasq b/package/gluon-wan-dnsmasq/files/etc/config/gluon-wan-dnsmasq
new file mode 100644
index 0000000000000000000000000000000000000000..748eecbfd0a9eba14c28499815ba0738da30b48b
--- /dev/null
+++ b/package/gluon-wan-dnsmasq/files/etc/config/gluon-wan-dnsmasq
@@ -0,0 +1,2 @@
+config 'static'
+       # list 'server' '192.168.0.1'		# Example
diff --git a/package/gluon-wan-dnsmasq/files/etc/init.d/gluon-wan-dnsmasq b/package/gluon-wan-dnsmasq/files/etc/init.d/gluon-wan-dnsmasq
index eae51927672641dcf95d7e0903ff877155839cbf..22bed0392f7e3f58d0f5bcd0e07a938e7b1abde5 100755
--- a/package/gluon-wan-dnsmasq/files/etc/init.d/gluon-wan-dnsmasq
+++ b/package/gluon-wan-dnsmasq/files/etc/init.d/gluon-wan-dnsmasq
@@ -16,7 +16,7 @@ RESOLV_CONF=$RESOLV_CONF_DIR/resolv.conf
 
 start() {
 	mkdir -p $RESOLV_CONF_DIR
-	touch $RESOLV_CONF
+	/lib/gluon/wan-dnsmasq/update.lua
 
 	LD_PRELOAD=libpacketmark.so LIBPACKETMARK_MARK=$PACKET_MARK service_start /usr/sbin/dnsmasq -x $SERVICE_PID_FILE -u root -i lo -p $PORT -h -r $RESOLV_CONF
 }
diff --git a/package/gluon-wan-dnsmasq/files/lib/gluon/wan-dnsmasq/update.lua b/package/gluon-wan-dnsmasq/files/lib/gluon/wan-dnsmasq/update.lua
index cf65e8d6c7d873992944b8dcd96705d8cccf8f55..0f97e0bdcce20333dc1c6367625167c97ab32471 100755
--- a/package/gluon-wan-dnsmasq/files/lib/gluon/wan-dnsmasq/update.lua
+++ b/package/gluon-wan-dnsmasq/files/lib/gluon/wan-dnsmasq/update.lua
@@ -5,21 +5,31 @@ local RESOLV_CONF = RESOLV_CONF_DIR .. '/resolv.conf'
 
 
 local ubus = require('ubus').connect()
+local uci = require('luci.model.uci').cursor()
 local fs = require 'nixio.fs'
 
 
-local function write_servers(f, iface)
-  local servers = ubus:call('network.interface.' .. iface, 'status', {}).inactive['dns-server']
+local function write_servers(f, servers)
   for _, server in ipairs(servers) do
     f:write('nameserver ', server, '\n')
   end
 end
 
+local function write_interface_servers(f, iface)
+  write_servers(f, ubus:call('network.interface.' .. iface, 'status', {}).inactive['dns-server'])
+end
+
 
 fs.mkdirr(RESOLV_CONF_DIR)
 local f = io.open(RESOLV_CONF, 'w+')
 
-pcall(write_servers, f, 'wan6')
-pcall(write_servers, f, 'wan')
+local static = uci:get_first('gluon-wan-dnsmasq', 'static', 'server')
+
+if type(static) == 'table' and #static > 0 then
+  write_servers(f, static)
+else
+  pcall(write_interface_servers, f, 'wan6')
+  pcall(write_interface_servers, f, 'wan')
+end
 
 f:close()