diff --git a/_addons.config b/_addons.config
index cea851b..e9f31eb 100644
--- a/_addons.config
+++ b/_addons.config
@@ -41,3 +41,7 @@ CONFIG_FEED__alpine_fan_control=m
 
 ### luci-app-netspeedtest
 #GIT_PACKAGE luci-app-netspeedtest=https://github.com/openwrt-xiaomi/luci-app-netspeedtest.git master
+
+
+### luci-app-xray
+#GIT_PACKAGE luci-app-xray=https://github.com/yichya/luci-app-xray.git master
diff --git a/_base.config b/_base.config
index 8814086..52efb95 100644
--- a/_base.config
+++ b/_base.config
@@ -225,3 +225,5 @@ CONFIG_PACKAGE_luci-i18n-nlbwmon-ru=y
 #DISABLED_SVC=nextdns
 #DISABLED_SVC=dnscrypt-proxy
 #DISABLED_SVC=shadowsocks-libev
+#DISABLED_SVC=xray_core
+#DISABLED_SVC=xray
diff --git a/_vpn.config b/_vpn.config
index 4e0df1d..240f002 100644
--- a/_vpn.config
+++ b/_vpn.config
@@ -22,3 +22,9 @@ CONFIG_PACKAGE_shadowsocks-libev-ss-rules=y
 CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel=y
 CONFIG_PACKAGE_luci-app-shadowsocks-libev=y
 CONFIG_PACKAGE_luci-i18n-shadowsocks-libev-ru=y
+
+CONFIG_PACKAGE_kmod-nft-tproxy=y
+#CONFIG_PACKAGE_xray-core=y
+CONFIG_PACKAGE_luci-app-xray=y
+#CONFIG_PACKAGE_v2ray-geoip=y
+#CONFIG_PACKAGE_v2ray-geosite=y
diff --git a/xmake.sh b/xmake.sh
index f73aba7..c5d6ff0 100755
--- a/xmake.sh
+++ b/xmake.sh
@@ -63,6 +63,16 @@ if [ -n "$DIS_SVC_LST" ]; then
 	echo $DIS_SVC_LST > $DIS_SVC_FN
 fi
 
+LUCI_XRAY_MK=$XDIR/package/addons/luci-app-xray/core/Makefile
+if [ -f $LUCI_XRAY_MK ]; then
+	pkg_xray_core=$( get_cfg_pkg_flag $CFG )
+	if [ "$pkg_xray_core" != "y" ]; then
+		# Forced disable xray-core package
+		sed -i '/CONFIG_PACKAGE_xray-core=/d' $CFG
+		sed -i 's/ +xray-core / /g' $LUCI_XRAY_MK
+	fi
+fi
+
 make defconfig
 
 NSS_DRV_PPPOE_ENABLE=$( get_cfg_opt_flag $CFG NSS_DRV_PPPOE_ENABLE )