diff --git a/luci-app-omr-bypass/Makefile b/luci-app-omr-bypass/Makefile
index 876d61e14..0c92a8bf8 100644
--- a/luci-app-omr-bypass/Makefile
+++ b/luci-app-omr-bypass/Makefile
@@ -6,7 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Interface to bypass domains
-LUCI_DEPENDS:=+dnsmasq-full +shadowsocks-libev-ss-rules +(LINUX_5_4||LINUX_5_15||TARGET_x86_64):iptables-mod-ndpi +iptables-mod-extra +(LINUX_5_4||LINUX_5_15||TARGET_x86_64):kmod-ipt-ndpi +iptables
+#LUCI_DEPENDS:=+dnsmasq-full +shadowsocks-libev-ss-rules +(LINUX_5_4||LINUX_5_15||TARGET_x86_64):iptables-mod-ndpi +iptables-mod-extra +(LINUX_5_4||LINUX_5_15||TARGET_x86_64):kmod-ipt-ndpi +iptables
+LUCI_DEPENDS:=+dnsmasq-full +shadowsocks-libev-ss-rules +(LINUX_5_4||LINUX_5_15):iptables-mod-ndpi +iptables-mod-extra +(LINUX_5_4||LINUX_5_15):kmod-ipt-ndpi +iptables
 
 PKG_LICENSE:=GPLv3
 
diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile
index a4216acdb..a764d87de 100644
--- a/ndpi-netfilter2/Makefile
+++ b/ndpi-netfilter2/Makefile
@@ -31,7 +31,8 @@ define Package/iptables-mod-ndpi
 	TITLE:=ndpi successor of OpenDPI
 	URL:=http://www.ntop.org/products/ndpi/
 #	DEPENDS:=+iptables +iptables-mod-conntrack-extra +kmod-ipt-ndpi +libpcap
-	DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64)
+#	DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64)
+	DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15)
 	MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
 endef
 
@@ -47,22 +48,17 @@ MAKE_PATH:=ndpi-netfilter
 MAKE_FLAGS += \
     KERNEL_DIR="$(LINUX_DIR)" \
     MODULES_DIR="$(TARGET_MODULES_DIR)" \
-    ARCH="$(LINUX_KARCH)" \
-    KERNEL_RELEASE="$(KERNEL_PATCHVER)" \
-    CROSS_COMPILE="$(TARGET_CROSS)" \
-    CC="$(TARGET_CC)" \
-#MAKE_FLAGS += \
-#    NDPI_PATH=$(PKG_BUILD_DIR)/ndpi-netfilter
+    NDPI_PATH=$(PKG_BUILD_DIR)/ndpi-netfilter \
+    ARCH="$(LINUX_KARCH)"
 
 define Build/Compile
 	(cd $(PKG_BUILD_DIR)/src/lib &&\
 	    gcc -g -O2 -fPIC -DPIC -DNDPI_LIB_COMPILATION -I../../src/include/ -I../../src/lib/third_party/include/ ndpi_network_list_compile.c -o ndpi_network_list_compile &&\
 	    ./ndpi_network_list_compile -o ndpi_network_list.c.inc ndpi_network_list_*.yaml)
-#	$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)/ndpi-netfilter
-	+$(KERNEL_MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)/ndpi-netfilter
+	$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)/ndpi-netfilter
 endef
 
-define Package/iptables-mod-ndpi/install
+define KernelPackage/iptables-mod-ndpi/install
 	$(INSTALL_DIR) $(1)/usr/lib/iptables
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ndpi-netfilter/ipt/libxt_ndpi.so $(1)/usr/lib/iptables
 endef
@@ -75,11 +71,13 @@ define KernelPackage/ipt-ndpi
 	    CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
 	FILES:= $(PKG_BUILD_DIR)/ndpi-netfilter/src/xt_ndpi.ko
 	AUTOLOAD:=$(call AutoProbe,xt_ndpi)
+#	MODPARAMS.xt_ndpi:=ndpi_enable_flow=1
 	KCONFIG:=\
 	    CONFIG_LIVEPATCH=y \
 	    CONFIG_NF_CONNTRACK=y \
 	    CONFIG_NF_CONNTRACK_LABELS=y \
-	    CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
+	    CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y \
+	    CONFIG_UNUSED_SYMBOLS=y
 endef
 
 $(eval $(call BuildPackage,iptables-mod-ndpi))