diff --git a/src/cpu.rs b/src/cpu.rs
index ed30728dc..25bed9480 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -8,7 +8,9 @@ use std::sync::atomic::Ordering;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "arm",
-    target_arch = "aarch64"
+    target_arch = "aarch64",
+    target_arch = "riscv32",
+    target_arch = "riscv64",
 )))]
 bitflags! {
     #[derive(Clone, Copy)]
@@ -42,6 +44,14 @@ bitflags! {
     }
 }
 
+#[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))]
+bitflags! {
+    #[derive(Clone, Copy)]
+    pub struct CpuFlags: c_uint {
+        const V = 1 << 0;
+    }
+}
+
 impl CpuFlags {
     pub const fn compile_time_detect() -> Self {
         let individual_flags = [
@@ -72,6 +82,8 @@ impl CpuFlags {
             CpuFlags::AVX512ICL,
             #[cfg(target_feature = "neon")]
             CpuFlags::NEON,
+            #[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))]
+            CpuFlags::V,
         ];
 
         let mut combined_flags = Self::empty();
diff --git a/tools/dav1d_cli_parse.rs b/tools/dav1d_cli_parse.rs
index 628f4f47d..4766b56fc 100644
--- a/tools/dav1d_cli_parse.rs
+++ b/tools/dav1d_cli_parse.rs
@@ -23,7 +23,12 @@ use rav1d::include::dav1d::dav1d::DAV1D_INLOOPFILTER_DEBLOCK;
 use rav1d::include::dav1d::dav1d::DAV1D_INLOOPFILTER_NONE;
 use rav1d::include::dav1d::dav1d::DAV1D_INLOOPFILTER_RESTORATION;
 use rav1d::src::cpu::dav1d_set_cpu_flags_mask;
-#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
+#[cfg(any(
+    target_arch = "arm",
+    target_arch = "aarch64",
+    target_arch = "riscv32",
+    target_arch = "riscv64"
+))]
 use rav1d::src::cpu::CpuFlags;
 use rav1d::src::lib::dav1d_default_settings;
 use rav1d::src::lib::dav1d_version;
@@ -103,8 +108,12 @@ cfg_if! {
         pub type CpuMask = c_uint;
 
         const ALLOWED_CPU_MASKS: &[u8; 50] = b", 'sse2', 'ssse3', 'sse41', 'avx2' or 'avx512icl'\0";
-    } else {
+    } else if #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] {
         const ALLOWED_CPU_MASKS: &[u8; 11] = b" or 'neon'\0";
+    } else if #[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))] {
+        const ALLOWED_CPU_MASKS: &[u8; 10] = b" or 'rvv'\0";
+    } else {
+        const ALLOWED_CPU_MASKS: &[u8; 42] = b"not yet implemented for this architecture\0";
     }
 }
 pub type arg = c_uint;
@@ -473,6 +482,15 @@ cfg_if! {
                 }
             },
         ];
+    } else if #[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))] {
+        static mut cpu_mask_tbl: [EnumParseTable; 1] = [
+            {
+                EnumParseTable {
+                    str_0: b"rvv\0" as *const u8 as *const c_char,
+                    val: CpuFlags::V.bits() as c_int,
+                }
+            },
+        ];
     } else {
         static mut cpu_mask_tbl: [EnumParseTable; 0] = [];
     }