diff --git a/gcc.spec b/gcc.spec
index 40465a2..40299af 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -119,7 +119,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.3%{?dist}
+Release: %{gcc_release}.3.1%{?dist}
 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@@ -1011,8 +1011,12 @@ CONFIGURE_OPTS="\
 %endif
 %endif
 %ifarch ppc64le
+%if 0%{?rhel} == 9
+	--with-cpu-32=power9 --with-tune-32=power9 --with-cpu-64=power9 --with-tune-64=power9 \
+%else
 	--with-cpu-32=power8 --with-tune-32=power8 --with-cpu-64=power8 --with-tune-64=power8 \
 %endif
+%endif
 %ifarch ppc
 	--build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
 %endif
@@ -1042,7 +1046,11 @@ CONFIGURE_OPTS="\
 %if 0%{?rhel} >= 7
 %if 0%{?rhel} > 7
 %if 0%{?rhel} > 8
+%if 0%{?rhel} == 9
+	--with-arch=z14 --with-tune=z15 \
+%else
 	--with-arch=z13 --with-tune=arch13 \
+%endif
 %else
 	--with-arch=z13 --with-tune=z14 \
 %endif
@@ -3126,6 +3134,10 @@ end
 %endif
 
 %changelog
+* Fri Apr  9 2021 Marek Polacek <polacek@redhat.com> 11.0.1-0.3.1
+- for %%{rhel} == 9, default to -march=z14 -mtune=z15 on s390x and
+  to -mcpu=power9 -mtune=power9 on ppc64le
+
 * Wed Mar 24 2021 Jakub Jelinek <jakub@redhat.com> 11.0.1-0.3
 - update from trunk
   - PRs analyzer/99614, c++/99239, c++/99283, c++/99318, c++/99425, c++/99456,