diff --git a/llvm.spec b/llvm.spec
index d0bd27c..b641be8 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -39,7 +39,7 @@
 
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	%{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
+Release:	%{baserelease}%{?rc_ver:.rc%{rc_ver}}.0.riscv64%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -189,7 +189,7 @@ pathfix.py -i %{__python3} -pn \
 # Because of these failures, lto is disabled for now.
 %global _lto_cflags %{nil}
 
-%ifarch s390 %{arm} %ix86
+%ifarch s390 %{arm} %ix86 riscv64
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
@@ -200,7 +200,7 @@ pathfix.py -i %{__python3} -pn \
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch s390 %{arm} %ix86
+%ifarch s390 %{arm} %ix86 riscv64
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
@@ -412,7 +412,7 @@ rm -Rf %{build_install_prefix}/share/opt-viewer
 # TODO: Fix test failures on arm
 # FIXME: use %%cmake_build instead of %%__ninja
 LD_LIBRARY_PATH=%{buildroot}/%{_libdir}  %{__ninja} check-all -C %{_vpath_builddir} || \
-%ifarch %{arm}
+%ifarch %{arm} riscv64
   :
 %else
   false
@@ -539,6 +539,9 @@ fi
 %endif
 
 %changelog
+* Wed Apr 14 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> - 11.0.0-1.0.riscv64
+- Add support for riscv64
+
 * Thu Oct 15 2020 sguelton@redhat.com - 11.0.0-1
 - Fix NVR