diff --git a/include/target.mk b/include/target.mk
index dfb7a7c143..e6fefc5467 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -55,6 +55,8 @@ DEFAULT_PACKAGES.nas:=\
 DEFAULT_PACKAGES.router:=\
 	dnsmasq-full \
 	firewall4 \
+	nftables \
+	kmod-nft-offload \
 	ppp \
 	ppp-mod-pppoe
 # For easy usage
@@ -68,7 +70,6 @@ DEFAULT_PACKAGES.tweak:=\
 	kmod-nf-nathelper-extra \
 	luci \
 	luci-app-cpufreq \
-	luci-app-turboacc \
 	luci-compat \
 	luci-lib-base \
 	luci-lib-fs \
diff --git a/package/network/config/firewall/files/firewall.config b/package/network/config/firewall/files/firewall.config
index dcf76ee42d..08cd219ab8 100644
--- a/package/network/config/firewall/files/firewall.config
+++ b/package/network/config/firewall/files/firewall.config
@@ -3,7 +3,8 @@ config defaults
 	option input		ACCEPT
 	option output		ACCEPT
 	option forward		REJECT
-	option fullcone	1
+	option flow_offloading	1
+	option fullcone		1
 # Uncomment this line to disable ipv6 rules
 #	option disable_ipv6	1
 
diff --git a/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch b/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch
index 9f28539b29..cc3c6403bc 100644
--- a/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch
+++ b/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch
@@ -22,12 +22,13 @@ Renew: ZiMing Mo <msylgj@immortalwrt.org>
 
 --- a/root/etc/config/firewall
 +++ b/root/etc/config/firewall
-@@ -5,6 +5,8 @@ config defaults
+@@ -5,6 +5,9 @@ config defaults
  	option forward		REJECT
  # Uncomment this line to disable ipv6 rules
  #	option disable_ipv6	1
-+	option fullcone '1'
-+	option fullcone6 '0'
++	option flow_offloading 1
++	option fullcone 1
++	option fullcone6 0
  
  config zone
  	option name		lan