diff --git a/llvm.spec b/llvm.spec
index ce0cb81..bb697b0 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -19,8 +19,8 @@
   %bcond_with gold
 %endif
 
-%bcond_without compat_build
-%bcond_with bundle_compat_lib
+%bcond_with compat_build
+%bcond_without bundle_compat_lib
 %bcond_without check
 
 %ifarch %ix86
@@ -34,8 +34,8 @@
 %endif
 
 %if %{with bundle_compat_lib}
-%global compat_maj_ver 15
-%global compat_ver %{compat_maj_ver}.0.7
+%global compat_maj_ver 16
+%global compat_ver %{compat_maj_ver}.0.6
 %endif
 
 %global maj_ver 17
@@ -65,13 +65,14 @@
 
 %global pkg_bindir %{install_bindir}
 %global pkg_includedir %{_includedir}/%{name}
-%global pkg_libdir %{install_libdir}
+%global pkg_datadir %{install_prefix}/share
 %else
 %global pkg_name llvm
 %global install_prefix /usr
+%global install_bindir %{_bindir}
 %global install_libdir %{_libdir}
-%global pkg_bindir %{_bindir}
-%global pkg_libdir %{install_libdir}
+%global install_includedir %{_includedir}
+%global pkg_datadir %{_datadir}
 %global exec_suffix %{nil}
 %endif
 
@@ -602,11 +603,11 @@ fi
 %if %{with gold}
 %{_libdir}/%{name}/lib/LLVMgold.so
 %endif
-%{pkg_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so
-%{pkg_libdir}/libLTO.so*
-%exclude %{pkg_libdir}/libLTO.so
+%{install_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so
+%{install_libdir}/libLTO.so*
+%exclude %{install_libdir}/libLTO.so
 %endif
-%{pkg_libdir}/libRemarks.so*
+%{install_libdir}/libRemarks.so*
 %if %{with bundle_compat_lib}
 %{_libdir}/libLLVM-%{compat_maj_ver}.so
 %endif
@@ -615,24 +616,20 @@ fi
 %license LICENSE.TXT
 
 %ghost %{_bindir}/llvm-config%{exec_suffix}
-%{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
+%{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
 %{_mandir}/man1/llvm-config*
 
-%if %{without compat_build}
-%{_includedir}/llvm
-%{_includedir}/llvm-c
-%{_libdir}/libLLVM.so
-%{_libdir}/cmake/llvm
-%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits}
-%ghost %{_bindir}/llvm-config-%{maj_ver}
-%else
 %{install_includedir}/llvm
 %{install_includedir}/llvm-c
+%{install_libdir}/libLLVM.so
+%{install_libdir}/cmake/llvm
+%if %{without compat_build}
+%{install_bindir}/llvm-config-%{maj_ver}-%{__isa_bits}
+%ghost %{_bindir}/llvm-config-%{maj_ver}
+%else
 %{pkg_includedir}/llvm
 %{pkg_includedir}/llvm-c
-%{pkg_libdir}/libLTO.so
-%{pkg_libdir}/libLLVM.so
-%{pkg_libdir}/cmake/llvm
+%{install_libdir}/libLTO.so
 %endif
 %if %{with bundle_compat_lib}
 %{_libdir}/llvm%{compat_maj_ver}/
@@ -644,16 +641,18 @@ fi
 
 %files static
 %license LICENSE.TXT
+%{install_libdir}/*.a
 %if %{without compat_build}
-%{_libdir}/*.a
-%exclude %{_libdir}/libLLVMTestingSupport.a
-%exclude %{_libdir}/libLLVMTestingAnnotations.a
-%exclude %{_libdir}/libllvm_gtest.a
-%exclude %{_libdir}/libllvm_gtest_main.a
-%else
-%{_libdir}/%{name}/lib/*.a
+%exclude %{install_libdir}/libLLVMTestingSupport.a
+%exclude %{install_libdir}/libLLVMTestingAnnotations.a
+%exclude %{install_libdir}/libllvm_gtest.a
+%exclude %{install_libdir}/libllvm_gtest_main.a
 %endif
 
+%files cmake-utils
+%license LICENSE.TXT
+%{pkg_datadir}/llvm/cmake
+
 %if %{without compat_build}
 
 %files test
diff --git a/sources b/sources
index 91c4dc0..7072f87 100644
--- a/sources
+++ b/sources
@@ -4,3 +4,5 @@ SHA512 (third-party-17.0.1.src.tar.xz) = 33d7f80c2fc72c654e2605742d96b4dccc3876d
 SHA512 (cmake-17.0.1.src.tar.xz.sig) = 3324dd7a76983d8fdf1d9201fb38cec643261556f461b706b9030ff64ba7d8819ecb4e2954e9a8c0b4181e0f2dadbcb3fb51181bc5885b87c11c9021addbdf71
 SHA512 (llvm-17.0.1.src.tar.xz.sig) = e736d7175e293f515279bf0e47b478ed3b5bae803a522c70284228f2834222a33212dbca8d1837c3997444b83a80b4989c305ec6ac08336168d4393aa782455d
 SHA512 (cmake-17.0.1.src.tar.xz) = fdfa055cb1d605669efc7b4d72be512bf8eacf681dc34f3c5fbf3fd0c99c8eec9dd5ab8904aac1b8e96fef54b936e0d7bbf0f1868c9baa0893fdd97dd39d92f1
+SHA512 (llvm-16.0.6.src.tar.xz) = 8d4cdadc9a1ad249fbf9248c8e56f3bcafab73a473a0b0ca73499ed8825c62e27668aac4f1d03341631e5ad93701621e834e9e196ca32eac3ef805cf1c860083
+SHA512 (llvm-16.0.6.src.tar.xz.sig) = 9adda28085f4a2e2a64dab1d8e4ff23c5629bbb0bb6b34afc081e44f6f85ac4f3c6cd0c3488af98c0fad939c33f9d2a8a0cbef67a577cd7fe3013bc2200452b1