diff --git a/llvm.spec b/llvm.spec
index f77698618af6a865ab6618e6b86509eab762f75c..ad2a41ada3320ca22df350ae88ebaafa95adabab 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -1,5 +1,4 @@
-%define anolis_release 2
-%global _clang_extra_ldflags %{?_lto_cflags}
+%define anolis_release 3
 
 # We are building with clang for faster/lower memory LTO builds.
 # See https://docs.fedoraproject.org/en-US/packaging-guidelines/#_compiler_macros
@@ -184,8 +183,17 @@ Summary: LLVM's modified googletest sources
 %description googletest
 LLVM's modified googletest sources.
 
-%endif
+%package toolset
+Summary:        Package that installs llvm-toolset
+Requires:       clang = %{version}
+Requires:       llvm = %{version}
+Requires:       lld = %{version}
+Buildarch:      noarch
+
+%description toolset
+This is the main package for llvm-toolset.
 
+%endif
 %prep
 %setup -T -q -b 2 -n %{cmake_srcdir}
 # TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir},
@@ -511,9 +519,15 @@ fi
 %{_datadir}/llvm/src/utils
 %{_libdir}/libLLVMTestingSupport.a
 
+%files toolset
+%license LICENSE.TXT
 %endif
 
 %changelog
+* Fri Feb 10 2023 Funda Wang <fundawang@yeah.net> - 15.0.7-3
+- Rebuild with clang 15
+- Produce toolset subpackage per upstream
+
 * Wed Feb 1 2023 Funda Wang <fundawang@yeah.net> - 15.0.7-2
 - Rebuild with clang