diff --git a/clang.spec b/clang.spec
index e78648e..827cb96 100644
--- a/clang.spec
+++ b/clang.spec
@@ -25,7 +25,7 @@
 
 %global maj_ver 18
 %global min_ver 1
-%global patch_ver 2
+%global patch_ver 8
 #global rc_ver 4
 
 %if %{with snapshot_build}
@@ -81,7 +81,7 @@
 
 Name:		%pkg_name
 Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	Apache-2.0 WITH LLVM-exception OR NCSA
@@ -777,6 +777,11 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
 
 %endif
 %changelog
+* Tue Jul 23 2024 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 18.1.8-1
+- Update to LLVM 18.1.8 (RHEL-28056)
+- Remove llvm17 compat package (RHEL-30890)
+- Enable pie (RHEL-33489)
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 18.1.2-3
 - Bump release for June 2024 mass rebuild
 
diff --git a/sources b/sources
index 425e3f9..0853c92 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (clang-18.1.2.src.tar.xz) = e969eb8ad163f0bbcd3998253fc6698d3e6c75ccf5233bc5d637736d522dfd67a5cc6977ee89b21d3d3866a07849460eeb3701d89986c139b7110dc6e27ff9fd
-SHA512 (clang-18.1.2.src.tar.xz.sig) = 0f36efa13d034321b74f73bbb1de893e725936c77d04629b23e29af24bef1c76b73328e9818afd0e32bef632c74fb0b2c54dfff265f8bfce7b5c6dffbc7f3c18
-SHA512 (clang-tools-extra-18.1.2.src.tar.xz) = dbfb476c75e720ce06bea700f15227a6a21e446335843d0cd539f73692a19864c3ec1036b1378bf0446ccf7850c382d19bbb2742d7159ef2a6caa57f63611d8c
-SHA512 (clang-tools-extra-18.1.2.src.tar.xz.sig) = 4fc4f4add88b0a70c83b4eba2478616a7223c5bf399cf027ddef14f82fd41fdd26c8784b26522ca1cc0198b22451bd76d747222d80e7a7a750ec171a3c32b088
+SHA512 (clang-18.1.8.src.tar.xz) = 4147ef5e3547e80fbea573a6e3964870b38e7a547e796deb8859ca670b039ddd1af289cd4feadcb4ab5e94211b2ab5e91dfa84f58f114fdcbc9e807c9de901ca
+SHA512 (clang-18.1.8.src.tar.xz.sig) = ff8a12108d47a97c05d0a0cd4b4af278cc0f84601970a1560e4005f256b3304c6c5129bd67c8f5a387596b8bdd54ddda5066d9db7e9ecb4bcb0bfcd57d319c49
+SHA512 (clang-tools-extra-18.1.8.src.tar.xz) = e6770875b1bfb3626de2e15133aa819669c889574134b7c22d30882717d0f400a73d2e0e881a2bd707e0b07bca5fcfd1d4a9e83b1101c7f15e4657782659b6fe
+SHA512 (clang-tools-extra-18.1.8.src.tar.xz.sig) = 7730d2e34c1f65863cd1ba7d88c12e7997f645742be6c7271f5216876724837a450ff41d6225274266e4dace8c687c1af37d7115578829bf797c5724448bb174