diff --git a/R.spec b/R.spec
index 9e4b6fc..66154f8 100644
--- a/R.spec
+++ b/R.spec
@@ -159,7 +159,7 @@
 
 Name: R
 Version: %{major_version}.%{minor_version}.%{patch_version}
-Release: 1%{?dist}
+Release: 1.0.riscv64%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz
@@ -850,7 +850,7 @@ mv %{buildroot}%{_libdir}/R/lib/libRblas.so %{buildroot}%{_libdir}/R/lib/libRref
 %if 0%{?zlibhack}
 # Most of these tests pass. Some don't. All pieces belong to you.
 %else
-%ifnarch ppc64 ppc64le armv7hl s390x aarch64
+%ifnarch ppc64 ppc64le armv7hl s390x aarch64 riscv64
 # Needed by tests/ok-error.R, which will smash the stack on PPC64. This is the purpose of the test.
 ulimit -s 16384
 TZ="Europe/Paris" make check
@@ -1280,6 +1280,9 @@ R CMD javareconf \
 %{_libdir}/libRmath.a
 
 %changelog
+* Wed Dec  2 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 4.0.3-1.0.riscv64
+- Disable tests on riscv64
+
 * Mon Oct 12 2020 Tom Callaway <spot@fedoraproject.org> - 4.0.3-1
 - update to 4.0.3