diff --git a/python3.11.spec b/python3.11.spec
index b234c8b..e7ecc8b 100644
--- a/python3.11.spec
+++ b/python3.11.spec
@@ -17,7 +17,7 @@ URL: https://www.python.org/
 #global prerel ...
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 1%{?dist}
+Release: 1.0.riscv64%{?dist}
 License: Python-2.0.1
 
 
@@ -1080,7 +1080,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 \
@@ -1603,6 +1608,9 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Sat Feb 18 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.11.2-1.0.riscv64
+- Increase test timeout on riscv64
+
 * Wed Feb 08 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.11.2-1
 - Update to 3.11.2