diff --git a/checks/architecture/Jamroot.jam b/checks/architecture/Jamroot.jam
index ca653b75..03f59534 100644
--- a/checks/architecture/Jamroot.jam
+++ b/checks/architecture/Jamroot.jam
@@ -19,5 +19,6 @@ obj arm      : arm.cpp ;
 obj combined : combined.cpp ;
 obj mips1    : mips1.cpp ;
 obj power    : power.cpp ;
+obj riscv    : riscv.cpp ;
 obj sparc    : sparc.cpp ;
 obj x86      : x86.cpp ;
diff --git a/checks/architecture/riscv.cpp b/checks/architecture/riscv.cpp
new file mode 100644
index 00000000..55f37796
--- /dev/null
+++ b/checks/architecture/riscv.cpp
@@ -0,0 +1,9 @@
+// riscv.cpp
+//
+// Distributed under the Boost Software License Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#if !defined(__riscv)
+#error "Not RISC-V"
+#endif