diff --git a/clang.spec b/clang.spec
index 04a43fa..2078586 100644
--- a/clang.spec
+++ b/clang.spec
@@ -15,7 +15,7 @@
 
 %global maj_ver 17
 %global min_ver 0
-%global patch_ver 4
+%global patch_ver 6
 #global rc_ver 4
 
 %if %{with snapshot_build}
@@ -207,11 +207,6 @@ Recommends: libatomic%{?_isa}
 Recommends: libomp-devel%{_isa} = %{version}
 Recommends: libomp%{_isa} = %{version}
 
-# Use lld as the default linker on ARM due to rhbz#1918924
-%ifarch %{arm}
-Requires: lld
-%endif
-
 %description libs
 Runtime library for clang.
 
@@ -329,8 +324,6 @@ rm test/CodeGen/profile-filter.c
 
 %build
 
-# Use ThinLTO to limit build time.
-%define _lto_cflags -flto=thin
 # And disable LTO on AArch64 entirely.
 %ifarch aarch64 riscv64
 %define _lto_cflags %{nil}
@@ -341,14 +334,7 @@ rm test/CodeGen/profile-filter.c
 %global _lto_cflags %nil
 %endif
 
-
-%if 0%{?__isa_bits} == 64
-sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py
-%else
-sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
-%endif
-
-%ifarch s390 s390x %{arm} aarch64 %ix86 ppc64le riscv64
+%ifarch s390 s390x aarch64 %ix86 ppc64le riscv64
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
@@ -370,7 +356,7 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DPYTHON_EXECUTABLE=%{__python3} \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch s390 s390x %{arm} %ix86 ppc64le riscv64
+%ifarch s390 s390x %ix86 ppc64le riscv64
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
@@ -420,9 +406,6 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
 	-DBUILD_SHARED_LIBS=OFF \
 	-DCLANG_REPOSITORY_STRING="%{?dist_vendor} %{version}-%{release}" \
 	-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
-%ifarch %{arm}
-	-DCLANG_DEFAULT_LINKER=lld \
-%endif
 	-DCLANG_DEFAULT_UNWINDLIB=libgcc
 
 %cmake_build
@@ -518,7 +501,7 @@ ln -s %{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/clang-format
 # requires lit.py from LLVM utilities
 # FIXME: Fix failing ARM & riscv64 tests
 LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} check-all -C %{__cmake_builddir} || \
-%ifarch %{arm} riscv64
+%ifarch riscv64
 :
 %else
 false
@@ -648,12 +631,15 @@ false
 %changelog
 %{?llvm_snapshot_changelog_entry}
 
-* Mon Nov 06 2023 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.4-1.1.riscv64
-- Rebuild with Clang
-
-* Sat Nov 04 2023 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.4-1.0.riscv64
+* Mon Dec 04 2023 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.6-1.0.riscv64
 - Add support for riscv64
 
+* Tue Nov 28 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.6-1
+- Update to LLVM 17.0.6
+
+* Tue Nov 14 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.5-1
+- Update to LLVM 17.0.5
+
 * Wed Nov 01 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.4-1
 - Update to LLVM 17.0.4
 
diff --git a/sources b/sources
index 7407684..75492ab 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (clang-17.0.4.src.tar.xz) = b014170e46660229733718244a85ba46f7b5c205d33640fd1ffdbe5256d356684c98d810767b6615895f6471ced0118415ea552464ec24ad5915fbf3b9cb6438
-SHA512 (clang-tools-extra-17.0.4.src.tar.xz) = 5cd8cf96768cb44306ecf8c2ea31373e173b4f0781aeac16d463da8862a56d1fa771d20bddda56af938c102c2b0b56f3584d37c238d6d32a891dd8a24fe65471
-SHA512 (clang-tools-extra-17.0.4.src.tar.xz.sig) = fde7e4a7df9070d4601013fcb35b6c4c67995a58d954f9174863a2ca8c5c361f81ae7f8cc4b3b6ef986109aac7bafcb16ca407706432b7716d1b9c9e96affe4d
-SHA512 (clang-17.0.4.src.tar.xz.sig) = 7557977208ffcf3a148d40e3e8c441c99c2c38a12f3ba7c6c7faf4d14e469f598f562c89d83b33808d34ae7c539212443dbcd8b0ed7a795a1bb2aa8963c7501d
+SHA512 (clang-17.0.6.src.tar.xz) = da6f670a52d60c46bbe6bfa2870106f6a6714c9566fab293b8c624a555308104a1a05cd065643091d7006ef4533a9a722dff1fccaf26f348a0c0a5c7b9331439
+SHA512 (clang-tools-extra-17.0.6.src.tar.xz) = 5110dd36ee1c966d22760000f0c28cf070fd00b05445d418d264dbd3b48426a203f934e402d408fab2602dbf39a29d66898cc7c69c1a52b5e0e6e7097f9db877
+SHA512 (clang-tools-extra-17.0.6.src.tar.xz.sig) = 17ed3072a402ffa9f723e5ae5257a68ea6f9c874bec50d91c88159d38d8c121d23974ff3983f6f0d3308b5ec07086ba5c2d4cabfe6cbefeb6613fc30b577f966
+SHA512 (clang-17.0.6.src.tar.xz.sig) = 091dca426d275f5a71836f2230e0f12f212527259cc4a941638104b8fcf42b4a122f9c140d07f8c663d38242d10ca5390de1f89d9d7bc0171b66c77a9aebbb3f