diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index aa4bd2d259..f85cd56b67 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -1175,6 +1175,7 @@ config KERNEL_NET_L3_MASTER_DEV
 
 config KERNEL_XDP_SOCKETS
 	bool "XDP sockets support"
+	default y if KERNEL_DEBUG_INFO_BTF
 	help
 	  XDP sockets allows a channel between XDP programs and
 	  userspace applications.
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index f6d83e5774..3e7440f949 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -1449,7 +1449,7 @@ $(eval $(call KernelPackage,inet-diag))
 define KernelPackage/xdp-sockets-diag
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PF_XDP sockets monitoring interface support for ss utility
-  DEPENDS:=+@KERNEL_XDP_SOCKETS
+  DEPENDS:=@KERNEL_XDP_SOCKETS
   KCONFIG:=CONFIG_XDP_SOCKETS_DIAG
   FILES:=$(LINUX_DIR)/net/xdp/xsk_diag.ko
   AUTOLOAD:=$(call AutoLoad,31,xsk_diag)