diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 3301b5f32fe2e..64caf3a555594 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -50,6 +50,7 @@ rust_abi() {
 		mips*)		  echo mips-unknown-linux-gnu;;
 		powerpc*)	  echo powerpc-unknown-linux-gnu;;
 		s390x*)		  echo s390x-unknown-linux-gnu;;
+		riscv64*)	  echo riscv64gc-unknown-linux-gnu;;
 		*)			  echo ${CTARGET};;
   esac
 }
@@ -121,5 +122,6 @@ rust_all_arch_uris()
                        $(rust_arch_uri powerpc64le-unknown-linux-gnu  "$@") ) "
   uris+="s390?       ( $(rust_arch_uri s390x-unknown-linux-gnu        "$@") ) "
   uris+="abi_x86_32? ( $(rust_arch_uri i686-unknown-linux-gnu         "$@") ) "
+  uris+="riscv?      ( $(rust_arch_uri riscv64gc-unknown-linux-gnu    "$@") ) "
   echo "${uris}"
 }