diff --git a/libcxx.spec b/libcxx.spec
index 7fa86cf..6f8a51a 100644
--- a/libcxx.spec
+++ b/libcxx.spec
@@ -8,7 +8,7 @@
 
 Name:		libcxx
 Version:	%{libcxx_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	2.0.riscv64%{?dist}
+Release:	2.1.riscv64%{?dist}
 Summary:	C++ standard library targeting C++11
 License:	MIT or NCSA
 URL:		http://libcxx.llvm.org/
@@ -24,8 +24,10 @@ BuildRequires:	gcc-c++ llvm-devel cmake llvm-static ninja-build
 BuildRequires:  python3-devel
 
 # The static libc++ links the static abi library in as well
+%if %{bootstrap} < 1
 BuildRequires:	libcxxabi-static
 BuildRequires:	libcxxabi-devel
+%endif
 
 %if %{bootstrap} < 1
 BuildRequires:	python3
@@ -139,6 +141,9 @@ install -m 0644 src/include/*.h %{buildroot}%{_includedir}/libcxx-internal/
 
 
 %changelog
+* Thu Aug 25 2022 David Abdurachmanov <davidlt@rivosinc.com> - 14.0.5-2.1.riscv64
+- Do not pull libcxxabi packages during bootstrap
+
 * Thu Aug 25 2022 David Abdurachmanov <davidlt@rivosinc.com> - 14.0.5-2.0.riscv64
 - Bootstrap on riscv64