diff --git a/clang.spec b/clang.spec
index 03cf84b..fca6d51 100644
--- a/clang.spec
+++ b/clang.spec
@@ -49,7 +49,7 @@
 
 Name:		%pkg_name
 Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -360,12 +360,10 @@ mv ../clang-%{compat_ver}.src ../clang
 
 %endif
 
-# TODO: Drop the HAVE_CXX_ATOMICS64_WITHOUT_LIB once clang15 is in the buildroot. It looks like
-# previously clang emitted __atomic_load for std::atomic<double>, which is not detected by cmake.
+# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF to match the default used by Fedora's GCC.
+# See https://bugzilla.redhat.com/show_bug.cgi?id=2134146
 %cmake  -G Ninja \
-%ifarch %ix86
-	-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=OFF \
-%endif
+	-DCLANG_DEFAULT_PIE_ON_LINUX=OFF
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -672,6 +670,9 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
 
 %endif
 %changelog
+* Mon Oct 17 2022 Nikita Popov <npopov@redhat.com> - 15.0.1-2
+- Default to non-pie, fix rhbz#2134146
+
 * Mon Sep 26 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.1-1
 - Update to 15.0.1