diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index 83a315b39..c3785fc25 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -1,4 +1,4 @@
-compilers=&gcc86:&icc:&clang:&cl:&cross:&ellcc:&zapcc
+compilers=&gcc86:&icc:&clang:&rvclang:&cl:&cross:&ellcc:&zapcc
 defaultCompiler=g81
 demangler=/opt/compiler-explorer/gcc-8.1.0/bin/c++filt
 objdumper=/opt/compiler-explorer/gcc-8.1.0/bin/objdump
@@ -147,6 +147,17 @@ compiler.clang_concepts.name=x86-64 clang (experimental concepts)
 compiler.clang_concepts.options=-std=c++2a -Xclang -fconcepts-ts -stdlib=libc++
 compiler.clang_concepts.notification=Highly experimental compiler. Bug reports welcomed at <a href="https://github.com/saarraz/clang-concepts/issues" target="_blank" rel="noopener noreferrer">github.com/saarraz/clang-concepts/issues <sup><small class="glyphicon glyphicon-new-window opens-new-window" title="Opens in a new window"></small></sup></a>
 
+# Clang for RISC-V
+group.rvclang.compilers=rv32clang:rv64clang
+group.rvclang.groupName=Clang RISC-V
+group.rvclang.supportsBinary=false
+compiler.rv32clang.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
+compiler.rv32clang.name=Clang RISC-V (32 bit)
+compiler.rv32clang.options=-target riscv32
+compiler.rv64clang.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
+compiler.rv64clang.name=Clang RISC-V (64 bit)
+compiler.rv64clang.options=-target riscv64
+
 # icc for x86
 group.icc.compilers=icc1301:icc16:icc17:icc18
 group.icc.intelAsm=-masm=intel