diff --git a/gcc.changes b/gcc.changes
index 5d5cb8f..ce594f6 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  9 07:41:14 UTC 2021 - Richard Biener <rguenther@suse.com>
+
+- With gcc-PIE add -pie even when -fPIC is specified but we are
+  not linking a shared library.  [boo#1185348]
+
 -------------------------------------------------------------------
 Wed May  5 12:48:07 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/gcc.spec b/gcc.spec
index 959a020..80d1bec 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -486,7 +486,7 @@ dir=${dir%/cc1}
 mkdir -p $RPM_BUILD_ROOT/$dir
 cat > $RPM_BUILD_ROOT/$dir/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 -pie}
+%%{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}
 EOF
 
 %post -n gcc-go