diff --git a/llvm.spec b/llvm.spec
index 8764c9a..c8afe12 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -80,7 +80,7 @@
 
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -225,6 +225,18 @@ Summary: LLVM's modified googletest sources
 %description googletest
 LLVM's modified googletest sources.
 
+%package toolset
+Summary: 	Package that installs llvm-toolset
+Requires:	clang = %{version}
+Requires:	llvm = %{version}
+
+%ifnarch s390x
+Requires:	lld = %{version}
+%endif
+
+%description toolset
+This is the main package for llvm-toolset.
+
 %endif
 
 %prep
@@ -622,6 +634,10 @@ fi
 %endif
 
 %changelog
+* Wed Sep 21 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.0-2
+- Add toolset subpackage
+  Related: rhbz#2118979
+
 * Fri Sep 16 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.0-1
 - Update to 15.0.0