diff --git a/openblas.spec b/openblas.spec
index 8bfe153..19f1655 100644
--- a/openblas.spec
+++ b/openblas.spec
@@ -15,7 +15,7 @@
 
 Name:           openblas
 Version:        0.3.21
-Release:        3%{?dist}
+Release:        3.0.riscv64%{?dist}
 Summary:        An optimized BLAS library based on GotoBLAS2
 License:        BSD
 URL:            https://github.com/xianyi/OpenBLAS/
@@ -51,7 +51,11 @@ Obsoletes:      %{name}-Rblas < %{version}-%{release}
 %global execstack 1
 %endif
 %else
+%ifnarch riscv64
 %global execstack 1
+%else
+%global execstack 0
+%endif
 %endif
 %if %{execstack}
 BuildRequires:  /usr/bin/execstack
@@ -381,6 +385,9 @@ TARGET="TARGET=ARMV8 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1"
 %ifarch s390x
 TARGET="TARGET=ZARCH_GENERIC DYNAMIC_ARCH=1 DYNAMIC_OLDER=1"
 %endif
+%ifarch riscv64
+TARGET="TARGET=RISCV64_GENERIC DYNAMIC_ARCH=0"
+%endif
 
 %if 0%{?rhel} == 5
 # Gfortran too old to recognize -frecursive
@@ -443,6 +450,9 @@ suffix=""
 %ifarch armv7hl
 suffix="_armv7"
 %endif
+%ifarch riscv64
+suffix="_riscv64_generic"
+%endif
 slibname=`basename %{buildroot}%{_libdir}/libopenblas${suffix}-*.so .so`
 mv %{buildroot}%{_libdir}/${slibname}.a %{buildroot}%{_libdir}/lib%{name}.a
 if [[ "$suffix" != "" ]]; then
@@ -649,6 +659,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
 %endif
 
 %changelog
+* Wed Oct 19 2022 David Abdurachmanov <davidlt@rivosinc.com> - 0.3.21-3.0.riscv64
+- Enable riscv64
+
 * Fri Aug 26 2022 Honza Horak <hhorak@redhat.com> - 0.3.21-3
 - Re-add flags for tests