diff --git a/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch b/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
deleted file mode 100644
index bebc548..0000000
--- a/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fb389f0cd6b4e8996157fa7d7bc347fde7b43656 Mon Sep 17 00:00:00 2001
-From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
-Date: Thu, 23 Mar 2023 16:06:10 -0300
-Subject: [PATCH] [lldb] Change LLVM_COMMON_CMAKE_UTILS usage
-
-Let LLVM_COMMON_CMAKE_UTILS store the directory where cmake modules are
-available and stop assuming its directory structure.
----
- lldb/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
-index 20d584c48bad..7bad2a9928cd 100644
---- a/lldb/CMakeLists.txt
-+++ b/lldb/CMakeLists.txt
-@@ -1,9 +1,9 @@
- cmake_minimum_required(VERSION 3.13.4)
- 
- if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
--  set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
-+  set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules)
- endif()
--include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
-+include(${LLVM_COMMON_CMAKE_UTILS}/CMakePolicy.cmake
-   NO_POLICY_SCOPE)
- 
- # Add path for custom modules.
--- 
-2.39.2
-
diff --git a/lldb.spec b/lldb.spec
index d8ee441..5cc311e 100644
--- a/lldb.spec
+++ b/lldb.spec
@@ -10,7 +10,7 @@
 
 Name:		lldb
 Version:	%{lldb_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Next generation high-performance debugger
 
 License:	Apache-2.0 WITH LLVM-exception OR NCSA
@@ -19,13 +19,12 @@ Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_v
 Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}%{?rc_ver:-rc%{rc_ver}}/%{lldb_srcdir}.tar.xz.sig
 Source2:	release-keys.asc
 
-Patch0: 0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
-
 BuildRequires:	clang
 BuildRequires:	cmake
 BuildRequires:	ninja-build
 BuildRequires:	llvm-devel = %{version}
 BuildRequires:	llvm-test = %{version}
+BuildRequires:	llvm-cmake-utils = %{version}
 BuildRequires:	clang-devel = %{version}
 BuildRequires:	ncurses-devel
 BuildRequires:	swig
@@ -79,8 +78,7 @@ The package contains the LLDB Python module.
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DLLVM_CONFIG:FILEPATH=/usr/bin/llvm-config-%{__isa_bits} \
-	-DLLVM_COMMON_CMAKE_UTILS=%{_libdir}/cmake/llvm/ \
-	\
+	-DLLVM_COMMON_CMAKE_UTILS=%{_datadir}/llvm/cmake \
 	-DLLDB_DISABLE_CURSES:BOOL=OFF \
 	-DLLDB_DISABLE_LIBEDIT:BOOL=OFF \
 	-DLLDB_DISABLE_PYTHON:BOOL=OFF \
@@ -135,6 +133,9 @@ rm -f %{buildroot}%{python3_sitearch}/six.*
 %{python3_sitearch}/lldb
 
 %changelog
+* Thu Jun 15 2023 Nikita Popov <npopov@redhat.com> - 16.0.5-3
+- Use llvm-cmake-utils package
+
 * Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 16.0.5-2
 - Rebuilt for Python 3.12