diff --git a/infra/bazel/matrix.bzl b/infra/bazel/matrix.bzl
index ebca24357..3db57d5b0 100644
--- a/infra/bazel/matrix.bzl
+++ b/infra/bazel/matrix.bzl
@@ -15,6 +15,7 @@ SUPPORTED_MATRIX = [
   ("linux", "mipsle", "0"),
   ("linux", "ppc64", "0"),
   ("linux", "ppc64le", "0"),
+  ("linux", "riscv64", "0"),
   ("linux", "s390x", "0"),
   ("freebsd", "amd64", "0"),
   ("freebsd", "386", "0"),
diff --git a/release/BUILD b/release/BUILD
index 7bab8437b..76f729cc9 100644
--- a/release/BUILD
+++ b/release/BUILD
@@ -342,6 +342,22 @@ pkg_zip(
     mappings = gen_mappings("linux", "mips64le", "0"),
 )
 
+pkg_zip(
+    name = "v2ray_linux_riscv64_package",
+    srcs = [
+        ":config_json",
+        ":doc",
+        ":geodata",
+        ":systemd",
+        "//infra/control/main:v2ctl_linux_riscv64",
+        "//infra/control/main:v2ctl_linux_riscv64_sig",
+        "//main:v2ray_linux_riscv64",
+        "//main:v2ray_linux_riscv64_sig",
+    ],
+    out = "v2ray-linux-riscv64.zip",
+    mappings = gen_mappings("linux", "riscv64", "0"),
+)
+
 pkg_zip(
     name = "v2ray_linux_s390x_package",
     srcs = [
diff --git a/release/bleedingrelease.sh b/release/bleedingrelease.sh
index 48b095fc4..b67a224fd 100755
--- a/release/bleedingrelease.sh
+++ b/release/bleedingrelease.sh
@@ -50,6 +50,7 @@ pushd ${ART_ROOT}
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32le.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64le.zip
+  go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-riscv64.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-s390x.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-freebsd-64.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-freebsd-32.zip
@@ -83,6 +84,7 @@ upload ${ART_ROOT}/v2ray-linux-mips32.zip
 upload ${ART_ROOT}/v2ray-linux-mips32le.zip
 upload ${ART_ROOT}/v2ray-linux-ppc64.zip
 upload ${ART_ROOT}/v2ray-linux-ppc64le.zip
+upload ${ART_ROOT}/v2ray-linux-riscv64.zip
 upload ${ART_ROOT}/v2ray-linux-s390x.zip
 upload ${ART_ROOT}/v2ray-freebsd-64.zip
 upload ${ART_ROOT}/v2ray-freebsd-32.zip
diff --git a/release/tagrelease.sh b/release/tagrelease.sh
index 34bf74b1a..6994b2b06 100755
--- a/release/tagrelease.sh
+++ b/release/tagrelease.sh
@@ -75,6 +75,7 @@ pushd ${ART_ROOT}
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32le.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64le.zip
+  go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-riscv64.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-s390x.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-freebsd-64.zip
   go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-freebsd-32.zip
@@ -102,6 +103,7 @@ upload ${ART_ROOT}/v2ray-linux-mips32.zip
 upload ${ART_ROOT}/v2ray-linux-mips32le.zip
 upload ${ART_ROOT}/v2ray-linux-ppc64.zip
 upload ${ART_ROOT}/v2ray-linux-ppc64le.zip
+upload ${ART_ROOT}/v2ray-linux-riscv64.zip
 upload ${ART_ROOT}/v2ray-linux-s390x.zip
 upload ${ART_ROOT}/v2ray-freebsd-64.zip
 upload ${ART_ROOT}/v2ray-freebsd-32.zip