diff --git a/clang.spec b/clang.spec
index ae7c828..8bed08d 100644
--- a/clang.spec
+++ b/clang.spec
@@ -62,7 +62,7 @@
 
 Name:		%pkg_name
 Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	Apache-2.0 WITH LLVM-exception OR NCSA
@@ -425,7 +425,9 @@ mv ../cmake-%{compat_ver}.src ../cmake
 	-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=OFF \
 %endif
 	-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
+%if 0%{?fedora} || 0%{?rhel} > 9
 	-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON \
+%endif
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -745,7 +747,10 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
 
 %endif
 %changelog
-* Thu Sep 28 2023 Timm Bäder <tbaeder@redhat.com> - 170.1-1
+* Wed Oct 04 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.1-2
+- Pick up macros.clang changes from Fedora
+
+* Thu Sep 28 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.1-1
 - Update to 17.0.1
 
 * Wed Jul 05 2023 Nikita Popov <npopov@redhat.com> - 16.0.6-1
diff --git a/macros.clang b/macros.clang
index 6f35452..88f259d 100644
--- a/macros.clang
+++ b/macros.clang
@@ -8,9 +8,4 @@
 # headers and libraries.  This path should be used by packages that need to
 # install files into this directory.  This macro's value changes every time
 # clang's version changes.
-%clang_resource_dir %{_libdir}/clang/%{clang_major_version}
-
-# This is the path to the clang resource directory that should be used
-# by packages that need to read files from this directory at runtime.
-# This macro only changes when clang's major version changes.
-%clang_resource_dir_readonly %{_libdir}/clang/%{clang_major_version}
+%clang_resource_dir %{_prefix}/lib/clang/%{clang_major_version}