diff --git a/packages/adblock/files/adblock.sh b/packages/adblock/files/adblock.sh
index fe6fc10fe..5315aca3a 100755
--- a/packages/adblock/files/adblock.sh
+++ b/packages/adblock/files/adblock.sh
@@ -566,7 +566,7 @@ f_extconf() {
 						set firewall."adblock_${zone}${port}".src="${zone}"
 						set firewall."adblock_${zone}${port}".proto="tcp udp"
 						set firewall."adblock_${zone}${port}".src_dport="${port}"
-						set firewall."adblock_${zone}${port}".dest_port="${port}"
+						set firewall."adblock_${zone}${port}".dest_port="5300"
 						set firewall."adblock_${zone}${port}".target="DNAT"
 						set firewall."adblock_${zone}${port}".family="any"
 						set firewall."adblock_${zone}${port}".ipset="!tsdns_bypass"
@@ -585,6 +585,25 @@ f_extconf() {
 		done
 	fi
 
+	if [ "${adb_enabled}" = "1" ] && [ "${adb_forcedns}" = "1" ] &&	/etc/init.d/firewall enabled && [ "$(uci -q get dhcp.adblock)" != "dnsmasq" ]; then
+		uci -q batch <<-EOC
+			set dhcp.adblock="dnsmasq"
+			set dhcp.adblock.port="5300"
+			set dhcp.adblock.noresolv="1"
+			set dhcp.adblock.max_ttl="60"
+			set dhcp.adblock.max_cache_ttl="60"
+			set dhcp.adblock.logqueries="0"
+			set dhcp.adblock.rebind_protection="0"
+			set dhcp.adblock.confdir="$adb_dnsdir"
+			add_list dhcp.adblock.ns_tag="automated"
+			add_list dhcp.adblock.server="127.0.0.1"
+		EOC
+	fi
+
+	if [ "${adb_enabled}" = "0" ] || [ "${adb_forcedns}" = "0" ]; then
+		uci -q delete dhcp.adblock
+	fi
+
 	# add adb_bypass
 	if [ "${adb_enabled}" = "1" ] && [ "${adb_forcedns}" = "1" ] &&	/etc/init.d/firewall enabled; then
 		if ! uci -q get firewall.tsdns_bypass >/dev/null; then
@@ -612,6 +631,7 @@ f_extconf() {
 	fi
 
 	f_uci "${config}"
+	f_uci "dhcp"
 }
 
 # restart dns backend
diff --git a/packages/ns-threat_shield/files/ts-dns b/packages/ns-threat_shield/files/ts-dns
index f67484be0..b216d1a19 100755
--- a/packages/ns-threat_shield/files/ts-dns
+++ b/packages/ns-threat_shield/files/ts-dns
@@ -20,10 +20,6 @@ if [ "$TS_ENABLED" = 1 ]; then
     # Setup new blacklist source
     uci set adblock.global.adb_srcarc="$DEST_DIR"/combined.sources.gz
 
-    # Setup dnsmasq as backend
-    uci set adblock.global.adb_dns='dnsmasq'
-    uci set adblock.global.adb_dnsinstance='0'
-
     # Setup wget with compression support
     uci set adblock.global.adb_fetchutil='wget'
     uci set adblock.global.adb_fetchparm="--compression=gzip --no-cache --no-cookies --max-redirect=0 --timeout=20 -O"