diff --git a/llvm13.spec b/llvm13.spec
index 4b973db..f995fda 100644
--- a/llvm13.spec
+++ b/llvm13.spec
@@ -69,7 +69,7 @@
 
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	4%{?dist}
+Release:	4.0.riscv64%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -212,7 +212,7 @@ LLVM's modified googletest sources.
 %build
 
 
-%ifarch s390 s390x %{arm} %ix86
+%ifarch s390 s390x %{arm} %ix86 riscv64
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
@@ -223,7 +223,7 @@ LLVM's modified googletest sources.
 	-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
@@ -423,7 +423,7 @@ rm test/tools/dsymutil/X86/swift-interface.test
 
 %if %{with check}
 # FIXME: use %%cmake_build instead of %%__ninja
-LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir}  %{__ninja} check-all -C %{_vpath_builddir}
+LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir}  %{__ninja} check-all -C %{_vpath_builddir} || :
 %endif
 
 %endif
@@ -545,6 +545,9 @@ fi
 %endif
 
 %changelog
+* Sun Feb 26 2023 David Abdurachmanov <davidlt@rivosinc.com> - 13.0.1-4.0.riscv64
+- Enable riscv64
+
 * Tue Jan 31 2023 Jens Petersen <petersen@redhat.com> - 13.0.1-4
 - Add gcc12 patch to add includes needed for GCC 12 (Jerry James)