diff --git a/mariadb10.11.spec b/mariadb10.11.spec
index 7f4db08..62b3086 100644
--- a/mariadb10.11.spec
+++ b/mariadb10.11.spec
@@ -10,7 +10,11 @@
 %{!?runselftest:%global runselftest 1}
 
 # Set this to 1 to see which tests fail, but 0 on production ready build
+%ifnarch riscv64
 %global ignore_testsuite_result 0
+%else
+%global ignore_testsuite_result 1
+%endif
 
 # The last version on which the full testsuite has been run
 # In case of further rebuilds of that version, don't require full testsuite to be run
@@ -157,7 +161,7 @@
 
 Name:             %{majorname}%{majorversion}
 Version:          %{package_version}
-Release:          1%{?with_debug:.debug}%{?dist}
+Release:          1%{?with_debug:.debug}.0.riscv64%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -1010,6 +1014,12 @@ make -f /usr/share/selinux/devel/Makefile %{majorname}-server-galera.pp
 %install
 %cmake_install
 
+%ifarch riscv64
+# Fix path: /usr/lib/pkgconfig/libmariadb.pc
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+mv %{buildroot}%{_prefix}/lib/pkgconfig/libmariadb.pc %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
+%endif
+
 # multilib header support #1625157
 for header in mysql/server/my_config.h mysql/server/private/config.h; do
 %multilib_fix_c_header --file %{_includedir}/$header
@@ -1779,6 +1789,10 @@ fi
 %endif
 
 %changelog
+* Fri Dec 20 2024 David Abdurachmanov <davidlt@rivosinc.com> - 3:10.11.10-1.0.riscv64
+- Ignore testsuite results (need to collect baseline)
+- Fix pkgconfig pc file location
+
 * Sat Nov 16 2024 Michal Schorm <mschorm@redhat.com> - 3:10.11.10-1
 - Rebase to 10.11.10