diff --git a/libcxx.spec b/libcxx.spec
index ce940cb..560d1d5 100644
--- a/libcxx.spec
+++ b/libcxx.spec
@@ -1,6 +1,8 @@
 # If you need to bootstrap this, turn this on.
 # Otherwise, you have a loop with libcxxabi
+%ifnarch riscv64
 %global toolchain clang
+%endif
 %global bootstrap 0
 
 %global libcxx_version 15.0.0
@@ -9,7 +11,7 @@
 
 Name:		libcxx
 Version:	%{libcxx_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	2%{?dist}
+Release:	2.2.riscv64%{?dist}
 Summary:	C++ standard library targeting C++11
 License:	MIT or NCSA
 URL:		http://libcxx.llvm.org/
@@ -160,6 +162,9 @@ install -m 0644 src/include/*.h %{buildroot}%{_includedir}/libcxx-internal/
 
 
 %changelog
+* Sat Oct 08 2022 David Abdurachmanov <davidlt@rivosinc.com> - 15.0.0-2.0.riscv64
+- Bootstrap again on riscv64 (new libcxxabi)
+
 * Tue Sep 13 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-2
 - Link libc++.a against libc++abi.a