diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec
index 5102b45..87068fc 100644
--- a/cross-aarch64-gcc13-bootstrap.spec
+++ b/cross-aarch64-gcc13-bootstrap.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec
index 58c4e2e..840cb72 100644
--- a/cross-aarch64-gcc13.spec
+++ b/cross-aarch64-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec
index 3b5fcfc..d2a1c17 100644
--- a/cross-amdgcn-gcc13.spec
+++ b/cross-amdgcn-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec
index 827ef39..0a8d60e 100644
--- a/cross-arm-gcc13.spec
+++ b/cross-arm-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec
index 4779e75..481a895 100644
--- a/cross-arm-none-gcc13-bootstrap.spec
+++ b/cross-arm-none-gcc13-bootstrap.spec
@@ -704,7 +704,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec
index 6525761..7660515 100644
--- a/cross-arm-none-gcc13.spec
+++ b/cross-arm-none-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec
index aa0f29f..ad2197d 100644
--- a/cross-avr-gcc13-bootstrap.spec
+++ b/cross-avr-gcc13-bootstrap.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec
index 9e5518d..4725e82 100644
--- a/cross-avr-gcc13.spec
+++ b/cross-avr-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec
index 55a63be..442ff49 100644
--- a/cross-bpf-gcc13.spec
+++ b/cross-bpf-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec
index ff4aecd..b1c67ff 100644
--- a/cross-epiphany-gcc13-bootstrap.spec
+++ b/cross-epiphany-gcc13-bootstrap.spec
@@ -704,7 +704,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec
index 59f0f34..6358727 100644
--- a/cross-epiphany-gcc13.spec
+++ b/cross-epiphany-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec
index aaf4299..8b68b41 100644
--- a/cross-hppa-gcc13-bootstrap.spec
+++ b/cross-hppa-gcc13-bootstrap.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec
index d05cf8f..14987c0 100644
--- a/cross-hppa-gcc13.spec
+++ b/cross-hppa-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec
index e47d3eb..a589c30 100644
--- a/cross-m68k-gcc13.spec
+++ b/cross-m68k-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec
index d1d0523..30a8860 100644
--- a/cross-mips-gcc13.spec
+++ b/cross-mips-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec
index 35b4323..26adfb7 100644
--- a/cross-nvptx-gcc13.spec
+++ b/cross-nvptx-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec
index 285f018..8db01b2 100644
--- a/cross-ppc64-gcc13.spec
+++ b/cross-ppc64-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec
index 0a8650d..8dabd25 100644
--- a/cross-ppc64le-gcc13.spec
+++ b/cross-ppc64le-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec
index a38e515..177dee0 100644
--- a/cross-pru-gcc13-bootstrap.spec
+++ b/cross-pru-gcc13-bootstrap.spec
@@ -704,7 +704,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec
index 84e8c53..e89dece 100644
--- a/cross-pru-gcc13.spec
+++ b/cross-pru-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec
index 797171d..1aad6d1 100644
--- a/cross-riscv64-elf-gcc13-bootstrap.spec
+++ b/cross-riscv64-elf-gcc13-bootstrap.spec
@@ -704,7 +704,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec
index 5fbb121..2458a18 100644
--- a/cross-riscv64-elf-gcc13.spec
+++ b/cross-riscv64-elf-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec
index 30ca737..c5a4fd5 100644
--- a/cross-riscv64-gcc13-bootstrap.spec
+++ b/cross-riscv64-gcc13-bootstrap.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec
index b7ff037..35de18d 100644
--- a/cross-riscv64-gcc13.spec
+++ b/cross-riscv64-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec
index 497a51c..9d7befa 100644
--- a/cross-rx-gcc13-bootstrap.spec
+++ b/cross-rx-gcc13-bootstrap.spec
@@ -704,7 +704,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec
index 2729a41..c97a9ae 100644
--- a/cross-rx-gcc13.spec
+++ b/cross-rx-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec
index f29e165..256b833 100644
--- a/cross-s390x-gcc13.spec
+++ b/cross-s390x-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec
index 95c4aac..fec4ea5 100644
--- a/cross-sparc-gcc13.spec
+++ b/cross-sparc-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec
index 60f55ea..98f2ed7 100644
--- a/cross-sparc64-gcc13.spec
+++ b/cross-sparc64-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec
index f30f128..9f36e38 100644
--- a/cross-x86_64-gcc13.spec
+++ b/cross-x86_64-gcc13.spec
@@ -703,7 +703,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/gcc.spec.in b/gcc.spec.in
index 2a20aa3..d50fd05 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1714,7 +1714,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec
index 614065c..48bdc9b 100644
--- a/gcc13-testresults.spec
+++ b/gcc13-testresults.spec
@@ -905,7 +905,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
diff --git a/gcc13.changes b/gcc13.changes
index 82e189d..760d34b 100644
--- a/gcc13.changes
+++ b/gcc13.changes
@@ -11,7 +11,7 @@ Tue Jun 13 09:22:50 UTC 2023 - Richard Biener <rguenther@suse.com>
 - Raise architecture levels for ALP.  [PED-153]
   * Raise POWER architecture baseline to power9.  [PED-2005]
   * Raise x86-64 architecture baseline to x86-64-v2 for ALP.  [PED-252]
-  * Raise s390x architecture baseline to z14.  [PED-253]
+  * Delay raising s390x architecture baseline to z14.  [PED-253]
 
 -------------------------------------------------------------------
 Mon May 22 09:05:30 UTC 2023 - Richard Biener <rguenther@suse.com>
diff --git a/gcc13.spec b/gcc13.spec
index 573a39f..ce19b0b 100644
--- a/gcc13.spec
+++ b/gcc13.spec
@@ -2722,7 +2722,7 @@ amdgcn-amdhsa,\
 %endif
 %if "%{TARGET_ARCH}" == "s390"
 %if %{suse_version} >= 1600
-        --with-tune=z14 --with-arch=z14 \
+        --with-tune=zEC12 --with-arch=z196 \
 %else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \