diff --git a/mock-core-configs.spec b/mock-core-configs.spec
index 2f41757..6438e0c 100644
--- a/mock-core-configs.spec
+++ b/mock-core-configs.spec
@@ -4,7 +4,7 @@
 
 Name:       mock-core-configs
 Version:    40.3
-Release:    1%{?dist}
+Release:    1.0.riscv64%{?dist}
 Summary:    Mock core config files basic chroots
 
 License:    GPL-2.0-or-later
@@ -17,6 +17,8 @@ URL:        https://github.com/rpm-software-management/mock/
 Source:     https://github.com/rpm-software-management/mock/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.gz
 BuildArch:  noarch
 
+Patch10:    mock-riscv64-configs.patch
+
 # The mock.rpm requires this.  Other packages may provide this if they tend to
 # replace the mock-core-configs.rpm functionality.
 Provides: mock-configs
@@ -45,6 +47,9 @@ Rocky Linux and various other specific or combined chroots.
 %prep
 %setup -q
 
+%ifarch riscv64
+%patch10 -p1 -b .riscv64
+%endif
 
 %build
 
@@ -151,6 +156,9 @@ fi
 %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg
 
 %changelog
+* Fri Apr 26 2024 David Abdurachmanov <davidlt@rivosinc.com> 40.3-1.0.riscv64
+- Add configs for riscv64 (only F40 is working)
+
 * Fri Apr 05 2024 Jakub Kadlcik <frostyx@email.cz> 40.3-1
 - Add initial c10s mock configs (Koji BUILDROOT only) (miro@hroncok.cz)
 - configs: use repo_arch, not target_arch with openSUSE (praiskup@redhat.com)
diff --git a/mock-riscv64-configs.patch b/mock-riscv64-configs.patch
new file mode 100644
index 0000000..e69de29