diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index 4dd90cc32..bbafc8c7b 100755
--- a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -519,6 +519,14 @@ return view.extend({
 			so.value(ipv4, ipaddrs[ipv4] ? '%s (%s)'.format(ipv4, ipaddrs[ipv4]) : ipv4);
 		});
 
+		so = ss.options(form.value, 'gw', _('Gateway IPv4 Address'));
+		so.rmempty = true;
+		so.datatype = 'or(ip4addr,"ignore")';
+		Object.keys(hosts).forEach(function(mac) {
+			if (hosts[mac].ipv4)
+				so.value(hosts[mac].ipv4);
+		});
+
 		so = ss.option(form.Value, 'leasetime', _('Lease time'));
 		so.rmempty = true;
 
diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile
index 2c8976aa6..13f73dc14 100755
--- a/ndpi-netfilter2/Makefile
+++ b/ndpi-netfilter2/Makefile
@@ -10,9 +10,8 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ndpi-netfilter2
-PKG_RELEASE:=3
-#PKG_REV:=b19e6392cf0c7d51c44e076a91fc4db0cbbd6403
-PKG_REV:=ce5cca1ec5972f8404ad66ec750a3c10968010fd
+PKG_RELEASE:=4
+PKG_REV:=cf017cc2fecee644d0b2ff633a17377f776d1505
 PKG_VERSION:=4-$(PKG_REV)
 
 PKG_SOURCE_PROTO:=git
diff --git a/ndpi-netfilter2/patches/fix-confidence-level.patch b/ndpi-netfilter2/patches/fix-confidence-level.patch
deleted file mode 100644
index a28dbc90d..000000000
--- a/ndpi-netfilter2/patches/fix-confidence-level.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d238ff6ad1715a640df62c7b47373293c8c136bd Mon Sep 17 00:00:00 2001
-From: Vitaly Lavrov <vel21ripn@gmail.com>
-Date: Tue, 22 Nov 2022 15:18:46 +0300
-Subject: [PATCH] Fix confidence level after ndpi_detection_giveup()
-
----
- ndpi-netfilter/src/main.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/ndpi-netfilter/src/main.c b/ndpi-netfilter/src/main.c
-index 5582eee938..3c39af8d5e 100644
---- a/ndpi-netfilter/src/main.c
-+++ b/ndpi-netfilter/src/main.c
-@@ -1676,9 +1676,20 @@ ndpi_mt(const struct sk_buff *skb, struct xt_action_param *par)
- 		    	detect_complete = 1;
- 			if(proto.app_protocol == NDPI_PROTOCOL_UNKNOWN) {
- 			    u_int8_t proto_guessed;
-+			    ndpi_protocol p_old = proto;
- 			    proto = ndpi_detection_giveup(n->ndpi_struct, flow, 1, &proto_guessed);
-+			    if(_DBG_TRACE_DPI) {
-+			        if( p_old.app_protocol != proto.app_protocol ||
-+				    p_old.master_protocol != proto.master_protocol ||
-+				    confidence != flow->confidence)
-+				    pr_info(" ndpi_process_packet ndpi_detection_giveup app,master [%u,%u]->[%u,%u] c %u->%u\n",
-+						p_old.app_protocol,p_old.master_protocol,
-+						proto.app_protocol,proto.master_protocol,
-+						confidence,flow->confidence);
-+			    }
- 			    ct_ndpi->proto.app_protocol = proto.app_protocol;
- 			    ct_ndpi->proto.master_protocol = proto.master_protocol;
-+			    ct_ndpi->confidence = confidence = flow->confidence;
- 			    c_proto->proto = pack_proto(proto);
- 			}
- 		    	if(_DBG_TRACE_DDONE)