diff --git a/mock-core-configs.spec b/mock-core-configs.spec
index ebdabb8..0c6634c 100644
--- a/mock-core-configs.spec
+++ b/mock-core-configs.spec
@@ -1,6 +1,6 @@
 Name:       mock-core-configs
 Version:    37.8
-Release:    1%{?dist}
+Release:    1.0.riscv64%{?dist}
 Summary:    Mock core config files basic chroots
 
 License:    GPL-2.0-or-later
@@ -13,6 +13,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
@@ -41,6 +43,7 @@ Rocky Linux and various other specific or combined chroots.
 %prep
 %setup -q
 
+%patch10 -p1 -b .riscv64
 
 %build
 
@@ -140,6 +143,9 @@ fi
 %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg
 
 %changelog
+* Wed Nov 23 2022 David Abdurachmanov <davidlt@rivosinc.com> 37.8-1.0.riscv64
+- Add configs for riscv64
+
 * Tue Sep 27 2022 Pavel Raiskup <praiskup@redhat.com> 37.8-1
 - openEuler 22.03 configs added (yikunkero@gmail.com)
 - openEuler 20.03 configs added (yikunkero@gmail.com)
diff --git a/mock-riscv64-configs.patch b/mock-riscv64-configs.patch
new file mode 100644
index 0000000..f172aec
--- /dev/null
+++ b/mock-riscv64-configs.patch
@@ -0,0 +1,42 @@
+diff --git a/etc/mock/fedora-37-riscv64.cfg b/etc/mock/fedora-37-riscv64.cfg
+new file mode 100644
+index 0000000..7374dec
+--- /dev/null
++++ b/etc/mock/fedora-37-riscv64.cfg
+@@ -0,0 +1,5 @@
++config_opts['releasever'] = '37'
++config_opts['target_arch'] = 'riscv64'
++config_opts['legal_host_arches'] = ('riscv64',)
++
++include('templates/fedora-branched.tpl')
+diff --git a/etc/mock/fedora-38-riscv64.cfg b/etc/mock/fedora-38-riscv64.cfg
+new file mode 100644
+index 0000000..65beeab
+--- /dev/null
++++ b/etc/mock/fedora-38-riscv64.cfg
+@@ -0,0 +1,4 @@
++config_opts['target_arch'] = 'riscv64'
++config_opts['legal_host_arches'] = ('riscv64',)
++
++include('templates/fedora-rawhide.tpl')
+diff --git a/etc/mock/fedora-eln-riscv64.cfg b/etc/mock/fedora-eln-riscv64.cfg
+new file mode 100644
+index 0000000..3cf209c
+--- /dev/null
++++ b/etc/mock/fedora-eln-riscv64.cfg
+@@ -0,0 +1,5 @@
++config_opts['target_arch'] = 'riscv64'
++config_opts['legal_host_arches'] = ('riscv64',)
++
++include('templates/fedora-eln.tpl')
++config_opts['description'] = 'Fedora ELN'
+diff --git a/etc/mock/fedora-rawhide-riscv64.cfg b/etc/mock/fedora-rawhide-riscv64.cfg
+new file mode 100644
+index 0000000..65beeab
+--- /dev/null
++++ b/etc/mock/fedora-rawhide-riscv64.cfg
+@@ -0,0 +1,4 @@
++config_opts['target_arch'] = 'riscv64'
++config_opts['legal_host_arches'] = ('riscv64',)
++
++include('templates/fedora-rawhide.tpl')