diff --git a/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch b/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
new file mode 100644
index 0000000..bebc548
--- /dev/null
+++ b/0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
@@ -0,0 +1,30 @@
+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 f5c6780..20e1efa 100644
--- a/lldb.spec
+++ b/lldb.spec
@@ -5,7 +5,7 @@
 %undefine _include_frame_pointers
 
 %global lldb_version 16.0.0
-%global rc_ver 4
+#global rc_ver 4
 %global lldb_srcdir %{name}-%{lldb_version}%{?rc_ver:rc%{rc_ver}}.src
 %global cmake_srcdir cmake-%{lldb_version}%{?rc_ver:rc%{rc_ver}}.src
 
@@ -18,9 +18,9 @@ License:	Apache-2.0 WITH LLVM-exception OR NCSA
 URL:		http://lldb.llvm.org/
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}%{?rc_ver:-rc%{rc_ver}}/%{lldb_srcdir}.tar.xz
 Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}%{?rc_ver:-rc%{rc_ver}}/%{lldb_srcdir}.tar.xz.sig
-Source2:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
-Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
-Source4:	release-keys.asc
+Source2:	release-keys.asc
+
+Patch0: 0001-lldb-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
 
 BuildRequires:	clang
 BuildRequires:	cmake
@@ -37,6 +37,7 @@ BuildRequires:	libxml2-devel
 BuildRequires:	libedit-devel
 BuildRequires:	python3-lit
 BuildRequires:	multilib-rpm-config
+BuildRequires:	doxygen
 
 Requires:	python3-lldb
 
@@ -68,13 +69,7 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 The package contains the LLDB Python module.
 
 %prep
-%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE2}'
-%setup -T -q -b 2 -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
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -n %{lldb_srcdir} -p2
 
 %build
@@ -85,6 +80,7 @@ mv %{cmake_srcdir} cmake
 	-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/ \
 	\
 	-DLLDB_DISABLE_CURSES:BOOL=OFF \
 	-DLLDB_DISABLE_LIBEDIT:BOOL=OFF \
@@ -140,6 +136,9 @@ rm -f %{buildroot}%{python3_sitearch}/six.*
 %{python3_sitearch}/lldb
 
 %changelog
+* Tue Mar 21 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0-1
+- Update to LLVM 16.0.0
+
 * Wed Mar 15 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc4-1
 - Update to LLVM 16.0.0 RC4
 
diff --git a/sources b/sources
index f9e3acb..838c4a1 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-SHA512 (cmake-16.0.0rc4.src.tar.xz) = 888cd3cf6a8eeca1306ab8a45fbcf0fdc91f10e34dc29a0bf7aef5b1efc9af0ab54866584857fbfb725147c8e4bc1a11e8a1b247fe439ebf93fe6a73fb004101
-SHA512 (cmake-16.0.0rc4.src.tar.xz.sig) = c2e4d7b79c5d2524449b8444eb4a9e1e625c50fc27dabcdd7410f44cc5b67cdd7931a5f31bc4b7652a034687d10d551aa9d89e3c01771d1b3e42b2b3a901745f
-SHA512 (lldb-16.0.0rc4.src.tar.xz) = e07f5f936bd5962c99b8f28ef5faa0c2768a8166f7468428ac133e051ad1209736dd2804ab1ca5c054925a565910a7fe9a7b6fd7419b190bdd6eba38eca8eec5
-SHA512 (lldb-16.0.0rc4.src.tar.xz.sig) = 0c0f6a7bdeeee39b31cddbd73c68136811bfa6c0ea79a523997ada4fa561eb0ed8d2ef8b6c37093030332e301ed5e6bb8858afc5a44f504b9bb9919bc11d02f2
+SHA512 (lldb-16.0.0.src.tar.xz) = 1b96934aab03b3438b7af43173e9498bc59e70117193637faa18c3e31a7895291479ed3ab1928bb076334f4a562b96ffc1ce00b59e1d1493a3088ca3ebb30843
+SHA512 (lldb-16.0.0.src.tar.xz.sig) = 0cf23b77325ecd0feb8fcf5a711cce93d1a72471ff14931424b6f93e6e945fddcc2764d80a6278a9253064170b80f39845f37f140d93390b887e6ac6bc569d0f