diff --git a/config/arch/riscv.in b/config/arch/riscv.in
new file mode 100644
index 00000000..13233472
--- /dev/null
+++ b/config/arch/riscv.in
@@ -0,0 +1,10 @@
+# RISC-V specific config options
+
+## depends on EXPERIMENTAL
+##
+## select ARCH_SUPPORTS_32
+## select ARCH_DEFAULT_32
+## select GCC_REQUIRE_7_or_later
+
+## help The RISC-V architecture, as defined by:
+## help     http://www.riscv.org/
diff --git a/scripts/build/arch/riscv.sh b/scripts/build/arch/riscv.sh
new file mode 100644
index 00000000..a0a5ba4f
--- /dev/null
+++ b/scripts/build/arch/riscv.sh
@@ -0,0 +1,5 @@
+# Compute RISC-V-specific values
+
+CT_DoArchTupleValues() {
+    CT_TARGET_ARCH="riscv${CT_ARCH_BITNESS}"
+}