diff --git a/sundials.spec b/sundials.spec
index 88ff398..70a6699 100644
--- a/sundials.spec
+++ b/sundials.spec
@@ -31,7 +31,11 @@
 %global with_sercheck 1
 
 ## PETSc ##
+%ifnarch riscv64
 %global with_petsc 1
+%else
+%global with_petsc 0
+%endif
 ###########
 
 ## SuperLUMT ##
@@ -75,7 +79,7 @@
 Summary:    Suite of nonlinear solvers
 Name:       sundials
 Version:    5.8.0
-Release:    11%{?dist}
+Release:    11.0.riscv64%{?dist}
 # SUNDIALS is licensed under BSD with some additional (but unrestrictive) clauses.
 # Check the file 'LICENSE' for details.
 License:    BSD
@@ -644,6 +648,7 @@ rm -f %{buildroot}%{_includedir}/sundials/LICENSE
 rm -f %{buildroot}%{_includedir}/sundials/NOTICE
 
 %check
+%ifnarch riscv64
 %if 0%{?with_openmpi}
 %if 0%{?with_openmpicheck}
 %define _vpath_builddir buildopenmpi_dir/build
@@ -703,6 +708,8 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %endif
 %endif
 ## if with_sercheck
+%endif
+## ifnarch riscv64
 
 %files
 %license sundials-%{version}/LICENSE
@@ -973,6 +980,10 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %doc sundials-%{version}/doc/arkode/*
 
 %changelog
+* Thu Jun 01 2023 David Abdurachmanov <davidlt@rivosinc.com> - 5.8.0-11.0.riscv64
+- Disable tests on riscv64 for now
+- Disable petsc on riscv64 for now
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild