diff --git a/gcc.spec.in b/gcc.spec.in
index a27a2c7..e1ece0a 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -2046,7 +2046,7 @@ done
 # The spec for the PIE subpackage
 cat > %{buildroot}/%{libsubdir}/defaults.spec <<EOF
 *default_spec:
-%%{pie|fpic|fPIC|fpie|fPIE|no-pie|fno-pic|fno-PIC|fno-pie|fno-PIE|shared|static|nostdlib|nodefaultlibs|nostartfiles:;:-fPIE}%%{fno-pic|fno-PIC|fno-pie|fno-PIE|pie|no-pie|shared|static|nostdlib|nodefaultlibs|nostartfiles:;: -pie}
+%%{pie|fpic|fPIC|fpie|fPIE|no-pie|fno-pic|fno-PIC|fno-pie|fno-PIE|shared|static|static-pie|nostdlib|nodefaultlibs|nostartfiles:;:-fPIE}%%{fno-pic|fno-PIC|fno-pie|fno-PIE|pie|no-pie|shared|static|static-pie|nostdlib|nodefaultlibs|nostartfiles:;: -pie}
 EOF
 
 # GCC-TESTSUITE-DELETE-END
diff --git a/gcc13.changes b/gcc13.changes
index 94b2d6d..2ebfdc9 100644
--- a/gcc13.changes
+++ b/gcc13.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 11 14:33:29 UTC 2023 - Andreas Schwab <schwab@suse.de>
+
+- Also handle -static-pie in the default-PIE specs
+
 -------------------------------------------------------------------
 Mon Jul 10 08:12:40 UTC 2023 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc13.spec b/gcc13.spec
index 87fdf0b..41e334b 100644
--- a/gcc13.spec
+++ b/gcc13.spec
@@ -3050,7 +3050,7 @@ done
 # The spec for the PIE subpackage
 cat > %{buildroot}/%{libsubdir}/defaults.spec <<EOF
 *default_spec:
-%%{pie|fpic|fPIC|fpie|fPIE|no-pie|fno-pic|fno-PIC|fno-pie|fno-PIE|shared|static|nostdlib|nodefaultlibs|nostartfiles:;:-fPIE}%%{fno-pic|fno-PIC|fno-pie|fno-PIE|pie|no-pie|shared|static|nostdlib|nodefaultlibs|nostartfiles:;: -pie}
+%%{pie|fpic|fPIC|fpie|fPIE|no-pie|fno-pic|fno-PIC|fno-pie|fno-PIE|shared|static|static-pie|nostdlib|nodefaultlibs|nostartfiles:;:-fPIE}%%{fno-pic|fno-PIC|fno-pie|fno-PIE|pie|no-pie|shared|static|static-pie|nostdlib|nodefaultlibs|nostartfiles:;: -pie}
 EOF
 
 %if 0%{?run_tests:1}