diff --git a/gcc.spec b/gcc.spec
index c0b423c..95e5f0d 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1206,7 +1206,11 @@ CONFIGURE_OPTS="\
 %endif
 %ifarch x86_64
 %if 0%{?rhel} > 8
+%if 0%{?rhel} > 9
+	--with-arch_64=x86-64-v3 \
+%else
 	--with-arch_64=x86-64-v2 \
+%endif
 %endif
 	--with-arch_32=x86-64 \
 %endif
@@ -1564,12 +1568,10 @@ for f in `find %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_plat
 done
 
 # Nuke bits/*.h.gch dirs
-# 1) there is no bits/*.h header installed, so when gch file can't be
-#    used, compilation fails
-# 2) sometimes it is hard to match the exact options used for building
+# 1) sometimes it is hard to match the exact options used for building
 #    libstdc++-v3 or they aren't desirable
-# 3) there are multilib issues, conflicts etc. with this
-# 4) it is huge
+# 2) there are multilib issues, conflicts etc. with this
+# 3) it is huge
 # People can always precompile on their own whatever they want, but
 # shipping this for everybody is unnecessary.
 rm -rf %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_platform}/bits/*.h.gch
@@ -1581,6 +1583,7 @@ cp -r -p ../libstdc++-v3/doc/html ../rpm.doc/libstdc++-v3/html
 cp -r -p $libstdcxx_doc_builddir/html ../rpm.doc/libstdc++-v3/html/api
 mkdir -p %{buildroot}%{_mandir}/man3
 cp -r -p $libstdcxx_doc_builddir/man/man3/* %{buildroot}%{_mandir}/man3/
+rm -f %{buildroot}%{_mandir}/man3/TEMP.*
 find ../rpm.doc/libstdc++-v3 -name \*~ | xargs rm
 %endif
 
@@ -3621,6 +3624,11 @@ end
 %endif
 
 %changelog
+* Thu Apr 25 2024 Jakub Jelinek <jakub@redhat.com>
+- switch to --with-arch_64=x86-64-v3 for latest RHEL
+- remove obsolete reason for not shipping *.gch* files
+- remove TEMP.* man page from libstdc++-docs
+
 * Thu Apr 11 2024 Jakub Jelinek <jakub@redhat.com> 14.0.1-0.15
 - update from trunk
   - PRs analyzer/114472, c++/114303, c++/114409, debug/112878,