diff --git a/libomp.spec b/libomp.spec
index d370c54..a0605c1 100644
--- a/libomp.spec
+++ b/libomp.spec
@@ -8,7 +8,6 @@
 %global libomp_version %{maj_ver}.0.5
 #global rc_ver 4
 %global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
-%global cmake_srcdir cmake-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
 
 
 %ifarch ppc64le
@@ -19,7 +18,7 @@
 
 Name: libomp
 Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: OpenMP runtime for clang
 
 License: Apache-2.0 WITH LLVM-exception OR NCSA
@@ -29,8 +28,6 @@ Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp
 Source2: release-keys.asc
 Source3: run-lit-tests
 Source4: lit.fedora.cfg.py
-Source5:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
-Source6:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
 
 BuildRequires: clang
 # For clang-offload-packager
@@ -48,6 +45,7 @@ BuildRequires:	gnupg2
 
 # libomptarget needs the llvm cmake files
 BuildRequires: llvm-devel
+BuildRequires: llvm-cmake-utils
 
 Requires: elfutils-libelf%{?isa}
 
@@ -78,19 +76,13 @@ OpenMP regression tests
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE6}' --data='%{SOURCE5}'
-%setup -T -q -b 5 -n %{cmake_srcdir}
-# TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir},
-# but this is not a CACHED variable, so we can't actually set it externally :(
-cd ..
-mv %{cmake_srcdir} cmake
 %autosetup -n %{libomp_srcdir} -p2
 
 %build
 # TODO: LIBOMP_HAVE_VERSION_SCRIPT_FLAG should be set automatically.
 %cmake	-GNinja \
 	-DLIBOMP_INSTALL_ALIASES=OFF \
-	-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
+	-DCMAKE_MODULE_PATH=%{_datadir}/llvm/cmake/Modules \
 	-DLLVM_DIR=%{_libdir}/cmake/llvm \
 	-DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/clang/%{maj_ver}/include \
 %if 0%{?__isa_bits} == 64
@@ -182,6 +174,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %{_libexecdir}/tests/libomp/
 
 %changelog
+* Thu Jun 15 2023 Nikita Popov <npopov@redhat.com> - 16.0.5-2
+- Use llvm-cmake-utils package
+
 * Tue Jun 06 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.5-1
 - Update to LLVM 16.0.5
 
diff --git a/sources b/sources
index 8a98945..cefc2fc 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
 SHA512 (openmp-16.0.5.src.tar.xz) = 88517ba4bc2088526e22847ae0031581c255fe89f8f43fc0a8cd83a929e0e2c62178b061fbb4273d7b23916f2300009d271dc4167a98c25d2084b6ff4da1f7ca
 SHA512 (openmp-16.0.5.src.tar.xz.sig) = a320760eb4fcece71a240470d34a04cb7bb4a5df4fd591290b53625356781465c73b9d106d8e57937e59d7c1f3306810a36578015f77cba8a34dd3ffeacddf48
-SHA512 (cmake-16.0.5.src.tar.xz) = 0b81399c872dc886f486568537dab7033de347ba9ea68243db7df6f5651b22c5e3034a5a505185e076de2091b0d8721d35136450d1e1d1ab821bfdd6c5992df2
-SHA512 (cmake-16.0.5.src.tar.xz.sig) = 12659c47e1ff4215f0bfe2354bd3a07618f560df0c3098f469c06c04825112cd0bf5610f0e58d7de3ee84d57adbb57a60a5de20b2c8bad9ff70c64e78c3dc3e5