diff --git a/libomp.spec b/libomp.spec
index ffec9a1..7a04377 100644
--- a/libomp.spec
+++ b/libomp.spec
@@ -87,6 +87,10 @@ mv %{cmake_srcdir} cmake
 %autosetup -n %{libomp_srcdir} -p2
 
 %build
+%ifarch riscv64
+%define _lto_cflags %{nil}
+%endif
+
 # TODO: LIBOMP_HAVE_VERSION_SCRIPT_FLAG should be set automatically.
 %cmake	-GNinja \
 	-DLIBOMP_INSTALL_ALIASES=OFF \
@@ -144,7 +148,7 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %ifnarch %{arm}
 %{_libdir}/libarcher.so
 %endif
-%ifnarch %{ix86} %{arm}
+%ifnarch %{ix86} %{arm} riscv64
 # libomptarget is not supported on 32-bit systems.
 %{_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver}
 %{_libdir}/libomptarget.rtl.amdgpu.nextgen.so.%{maj_ver}
@@ -165,12 +169,14 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %endif
 %ifnarch %{ix86} %{arm}
 # libomptarget is not supported on 32-bit systems.
+%ifnarch riscv64
 %{_libdir}/libomptarget.rtl.amdgpu.so
 %{_libdir}/libomptarget.rtl.amdgpu.nextgen.so
 %{_libdir}/libomptarget.rtl.cuda.so
 %{_libdir}/libomptarget.rtl.cuda.nextgen.so
 %{_libdir}/libomptarget.rtl.%{libomp_arch}.so
 %{_libdir}/libomptarget.rtl.%{libomp_arch}.nextgen.so
+%endif
 %{_libdir}/libomptarget.devicertl.a
 %{_libdir}/libomptarget-amdgpu-*.bc
 %{_libdir}/libomptarget-nvptx-*.bc
@@ -182,6 +188,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %{_libexecdir}/tests/libomp/
 
 %changelog
+* Tue Apr 25 2023 David Abdurachmanov <davidlt@rivosinc.com> - 16.0.1-1.0.riscv64
+- Add support for riscv64
+
 * Thu Apr 13 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.1-1
 - Update to LLVM 16.0.1