diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile
index b7e8b6f10a..d481f705ee 100644
--- a/package/lean/v2ray/Makefile
+++ b/package/lean/v2ray/Makefile
@@ -7,29 +7,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray
-PKG_VERSION:=4.8.0
-PKG_RELEASE:=1
+PKG_VERSION:=v4.8.0
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 ifeq ($(ARCH),x86_64)
-	PKG_ARCH_V2RAY:=amd64
+	PKG_ARCH_V2RAY:=linux-64
 endif
 ifeq ($(ARCH),mipsel)
-	PKG_ARCH_V2RAY:=mipsle
+	PKG_ARCH_V2RAY:=linux-mipsle
 endif
 ifeq ($(ARCH),mips)
-	PKG_ARCH_V2RAY:=mips
+	PKG_ARCH_V2RAY:=linux-mips
 endif
 ifeq ($(ARCH),i386)
-	PKG_ARCH_V2RAY:=386
+	PKG_ARCH_V2RAY:=linux-32
 endif
 ifeq ($(ARCH),arm)
-	PKG_ARCH_V2RAY:=arm
-	ifeq ($(TARGET_ARCH_PACKAGES),arm_cortex-a9)
-    PKG_ARCH_V2RAY:=armv6
-  endif
+	PKG_ARCH_V2RAY:=linux-arm
 endif
 ifeq ($(ARCH),aarch64)
-	PKG_ARCH_V2RAY:=arm64
+	PKG_ARCH_V2RAY:=linux-arm64
 endif
 
 include $(INCLUDE_DIR)/package.mk
@@ -38,15 +35,52 @@ define Package/$(PKG_NAME)
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=V2Ray is a cross-platform proxy software
-	DEPENDS:=+ca-certificates
+	DEPENDS:=
 	URL:=https://github.com/v2ray/v2ray-core
 endef
 
+define Package/$(PKG_NAME)/config
+menu "V2Ray Configuration"
+	depends on PACKAGE_v2ray
+
+config PACKAGE_V2RAY_INCLUDE_V2RAY
+	bool "Include v2ray"
+	default y
+
+config PACKAGE_V2RAY_SOFTFLOAT
+	bool "Use soft-float binaries (mips/mipsle only)"
+	depends on PACKAGE_V2RAY_INCLUDE_V2RAY
+	default n
+
+config PACKAGE_V2RAY_INCLUDE_V2CTL
+	bool "Include v2ctl"
+	depends on PACKAGE_V2RAY_INCLUDE_V2RAY
+	default y
+
+config PACKAGE_V2RAY_INCLUDE_GEOIP
+	bool "Include geoip.dat"
+	depends on PACKAGE_V2RAY_INCLUDE_V2CTL
+	default n
+
+config PACKAGE_V2RAY_INCLUDE_GEOSITE
+	bool "Include geosite.dat"
+	depends on PACKAGE_V2RAY_INCLUDE_V2CTL
+	default n
+
+endmenu
+endef
+
 define Package/$(PKG_NAME)/description
 V2Ray is a cross-platform proxy software
 endef
 
 define Build/Prepare
+	[ ! -f $(PKG_BUILD_DIR)/v2ray-$(PKG_VERSION)-$(PKG_ARCH_V2RAY).zip ] && wget https://github.com/v2ray/v2ray-core/releases/download/$(PKG_VERSION)/v2ray-$(PKG_ARCH_V2RAY).zip -O $(PKG_BUILD_DIR)/v2ray-$(PKG_VERSION)-$(PKG_ARCH_V2RAY).zip
+	unzip -o $(PKG_BUILD_DIR)/v2ray-$(PKG_VERSION)-$(PKG_ARCH_V2RAY).zip -d $(PKG_BUILD_DIR)
+ifdef CONFIG_PACKAGE_V2RAY_SOFTFLOAT
+	[ -f $(PKG_BUILD_DIR)/v2ray_softfloat ] && mv $(PKG_BUILD_DIR)/v2ray_softfloat $(PKG_BUILD_DIR)/v2ray || echo "Can't find soft-float binary."
+	[ -f $(PKG_BUILD_DIR)/v2ctl_softfloat ] && mv $(PKG_BUILD_DIR)/v2ctl_softfloat $(PKG_BUILD_DIR)/v2ctl || echo "Can't find soft-float binary."
+endif
 endef
 
 define Build/Configure
@@ -57,7 +91,18 @@ endef
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/bin/v2ray
-	$(INSTALL_BIN) ./files/$(PKG_ARCH_V2RAY)/v2ray $(1)/usr/bin/v2ray/
+ifdef CONFIG_PACKAGE_V2RAY_INCLUDE_V2RAY
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/v2ray $(1)/usr/bin/v2ray/
+endif
+ifdef CONFIG_PACKAGE_V2RAY_INCLUDE_V2CTL
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/v2ctl $(1)/usr/bin/v2ray/
+endif
+ifdef CONFIG_PACKAGE_V2RAY_INCLUDE_GEOIP
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/geoip.dat $(1)/usr/bin/v2ray/
+endif
+ifdef CONFIG_PACKAGE_V2RAY_INCLUDE_GEOSITE
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/geosite.dat $(1)/usr/bin/v2ray/
+endif
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call BuildPackage,$(PKG_NAME)))
\ No newline at end of file
diff --git a/package/lean/v2ray/files/386/v2ray b/package/lean/v2ray/files/386/v2ray
deleted file mode 100755
index c9dfc9054a..0000000000
Binary files a/package/lean/v2ray/files/386/v2ray and /dev/null differ
diff --git a/package/lean/v2ray/files/amd64/v2ray b/package/lean/v2ray/files/amd64/v2ray
deleted file mode 100755
index 83e6ef0e11..0000000000
Binary files a/package/lean/v2ray/files/amd64/v2ray and /dev/null differ
diff --git a/package/lean/v2ray/files/arm/v2ray b/package/lean/v2ray/files/arm/v2ray
deleted file mode 100755
index d47a1321f8..0000000000
Binary files a/package/lean/v2ray/files/arm/v2ray and /dev/null differ
diff --git a/package/lean/v2ray/files/arm64/v2ray b/package/lean/v2ray/files/arm64/v2ray
deleted file mode 100755
index 3b6d48eff8..0000000000
Binary files a/package/lean/v2ray/files/arm64/v2ray and /dev/null differ
diff --git a/package/lean/v2ray/files/armv6/v2ray b/package/lean/v2ray/files/armv6/v2ray
deleted file mode 100755
index 29440ca3ae..0000000000
Binary files a/package/lean/v2ray/files/armv6/v2ray and /dev/null differ
diff --git a/package/lean/v2ray/files/mips/v2ray b/package/lean/v2ray/files/mips/v2ray
deleted file mode 100755
index 174169e0b0..0000000000
Binary files a/package/lean/v2ray/files/mips/v2ray and /dev/null differ
diff --git a/package/lean/v2ray/files/mipsle/v2ray b/package/lean/v2ray/files/mipsle/v2ray
deleted file mode 100755
index ad1f6ba7a2..0000000000
Binary files a/package/lean/v2ray/files/mipsle/v2ray and /dev/null differ