diff --git a/python3.11.spec b/python3.11.spec
index 67b517f..8251aa7 100644
--- a/python3.11.spec
+++ b/python3.11.spec
@@ -17,7 +17,7 @@ URL: https://www.python.org/
 %global prerel rc1
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 2%{?dist}
+Release: 2.0.riscv64%{?dist}
 License: Python
 
 
@@ -1074,7 +1074,12 @@ CheckPython() {
   #  upstream report: https://bugs.python.org/issue45783
 
   LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
-    -wW --slowest -j0 --timeout=1800 \
+    -wW --slowest -j0 \
+    %ifnarch riscv64
+    --timeout=1800 \
+    %else
+    --timeout=18000 \
+    %endif
     -i test_freeze_simple_script \
     %if %{with bootstrap}
     -x test_distutils \
@@ -1082,6 +1087,10 @@ CheckPython() {
     %ifarch %{mips64}
     -x test_ctypes \
     %endif
+    %ifarch riscv64
+    -x test_gdb \
+    -x test_venv \
+    %endif
 
   echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName
 
@@ -1595,6 +1604,9 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Fri Aug 19 2022 David Abdurachmanov <davidlt@rivosinc.com> - 3.11.0~rc1-2.0.riscv64
+- Enable riscv64
+
 * Tue Aug 09 2022 Miro Hrončok <mhroncok@redhat.com> - 3.11.0~rc1-2
 - Don't use custom installation schemes
 - Fixes rhbz#2026979