diff --git a/.compiler-rt.metadata b/.compiler-rt.metadata
index f138bf8..48eac88 100644
--- a/.compiler-rt.metadata
+++ b/.compiler-rt.metadata
@@ -1,2 +1,2 @@
-91f03b578aff0fda6b9d3e2185e6ea5e588c6d47 SOURCES/compiler-rt-14.0.6.src.tar.xz
-b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc
+40f2a886636168f6478e20933906bcece2fd6b97 SOURCES/compiler-rt-15.0.7.src.tar.xz
+347bdd5ee6d6b93c9644c268511815912c0fb2dc SOURCES/release-keys.asc
diff --git a/.gitignore b/.gitignore
index 671a08d..115fc60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/compiler-rt-14.0.6.src.tar.xz
-SOURCES/tstellar-gpg-key.asc
+SOURCES/compiler-rt-15.0.7.src.tar.xz
+SOURCES/release-keys.asc
diff --git a/SOURCES/add-llvm-cmake-package.patch b/SOURCES/add-llvm-cmake-package.patch
deleted file mode 100644
index b7b63b6..0000000
--- a/SOURCES/add-llvm-cmake-package.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit b18bde7a9bd6ed80f5721c47c805f0158b4fe9f8
-Author: Timm Bäder <tbaeder@redhat.com>
-Date:   Wed Mar 9 07:17:21 2022 +0100
-
-    [compiler-rt] Add LLVM cmake package in standalone builds
-    
-    So the other files from the toplevel cmake/Modules directory have a
-    chance of being found.
-
-diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
-index 3a41aa43e406..6516e10fa3c5 100644
---- a/compiler-rt/CMakeLists.txt
-+++ b/compiler-rt/CMakeLists.txt
-@@ -28,6 +28,12 @@ else()
-   set(CMAKE_CFG_RESOLVED_INTDIR "")
- endif()
- 
-+if(COMPILER_RT_STANDALONE_BUILD)
-+  # Needed to find the other modules from the toplevel cmake/Modules dir
-+  find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")
-+  list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")
-+endif()
-+
- include(SetPlatformToolchainTools)
- include(base-config-ix)
- include(CompilerRTUtils)
-diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt
-index 5c2b634e1180..098fb0481517 100644
---- a/compiler-rt/test/CMakeLists.txt
-+++ b/compiler-rt/test/CMakeLists.txt
-@@ -1,6 +1,3 @@
--# Needed for lit support in standalone builds.
--include(AddLLVM)
--
- option(COMPILER_RT_TEST_STANDALONE_BUILD_LIBS
-   "When set to ON and testing in a standalone build, test the runtime \
-   libraries built by this standalone build rather than the runtime libraries \
diff --git a/SOURCES/compiler-rt-14.0.6.src.tar.xz.sig b/SOURCES/compiler-rt-14.0.6.src.tar.xz.sig
deleted file mode 100644
index c88e808..0000000
Binary files a/SOURCES/compiler-rt-14.0.6.src.tar.xz.sig and /dev/null differ
diff --git a/SOURCES/compiler-rt-15.0.7.src.tar.xz.sig b/SOURCES/compiler-rt-15.0.7.src.tar.xz.sig
new file mode 100644
index 0000000..bb33dff
Binary files /dev/null and b/SOURCES/compiler-rt-15.0.7.src.tar.xz.sig differ
diff --git a/SPECS/compiler-rt.spec b/SPECS/compiler-rt.spec
index a90e24e..916f5a8 100644
--- a/SPECS/compiler-rt.spec
+++ b/SPECS/compiler-rt.spec
@@ -1,6 +1,6 @@
-%global compiler_rt_version 14.0.6
-#global rc_ver 2
-%global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src
+%global toolchain clang
+%global compiler_rt_version 15.0.7
+%global crt_srcdir compiler-rt-%{compiler_rt_version}.src
 
 # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271
 %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE)
@@ -9,20 +9,17 @@
 %global optflags %(echo %{optflags} -Dasm=__asm__)
 
 Name:		compiler-rt
-Version:	%{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}
+Version:	%{compiler_rt_version}
 Release:	1%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	NCSA or MIT
 URL:		http://llvm.org
-Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz
-Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig
-Source2:	tstellar-gpg-key.asc
+Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}/%{crt_srcdir}.tar.xz
+Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}/%{crt_srcdir}.tar.xz.sig
+Source2:	release-keys.asc
 
-Patch0:		add-llvm-cmake-package.patch
-
-BuildRequires:	gcc
-BuildRequires:	gcc-c++
+BuildRequires:	clang
 BuildRequires:	cmake
 BuildRequires:	ninja-build
 BuildRequires:	python3
@@ -48,9 +45,12 @@ instrumentation, and Blocks C language extension.
 %py3_shebang_fix lib/hwasan/scripts/hwasan_symbolize
 
 %build
+# Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files.
+export ASMFLAGS=$CFLAGS
+
 %cmake	-GNinja \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	-DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \
+	-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	\
 %if 0%{?__isa_bits} == 64
@@ -110,6 +110,15 @@ popd
 %endif
 
 %changelog
+* Tue Jan 17 2023 Konrad Kleine <kkleine@redhat.com> - 15.0.7-1
+- Update to LLVM 15.0.7
+
+* Fri Dec 09 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.6-1
+- Update to LLVM 15.0.6
+
+* Thu Sep 29 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.1-1
+- Update to LLVM 15.0.1
+
 * Wed Jul 20 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.6-1
 - 14.0.6 Release