diff --git a/gcc/optc-save-gen.awk b/gcc/optc-save-gen.awk
index b9c7187a3b9..14b8d03888e 100644
--- a/gcc/optc-save-gen.awk
+++ b/gcc/optc-save-gen.awk
@@ -1445,6 +1445,12 @@ checked_options["TARGET_CASE_VECTOR_PC_RELATIVE"]++
 checked_options["arc_size_opt_level"]++
 # arm exceptions
 checked_options["arm_fp16_format"]++
+# s390 exceptions
+checked_options["param_max_completely_peel_times"]++
+checked_options["param_max_completely_peeled_insns"]++
+checked_options["param_max_unroll_times"]++
+checked_options["param_max_unrolled_insns"]++
+
 
 for (i = 0; i < n_opts; i++) {
 	name = var_name(flags[i]);
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/pr99313.c b/gcc/testsuite/gcc.target/s390/target-attribute/pr99313.c
new file mode 100644
index 00000000000..bd85983964c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/pr99313.c
@@ -0,0 +1,5 @@
+/* PR target/99313 */
+
+#pragma GCC push_options
+#pragma GCC target ("arch=z13")
+#pragma GCC pop_options