diff --git a/redhat-hardened-cc1 b/redhat-hardened-cc1
index 04b8f3c..4d1bf59 100644
--- a/redhat-hardened-cc1
+++ b/redhat-hardened-cc1
@@ -1,4 +1,4 @@
 %rename cc1_options rh_cc1_options_old
 
 *cc1_options:
-%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIC}}}}} %(rh_cc1_options_old)
+%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}} %(rh_cc1_options_old)
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index dab6b05..a7f7fef 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.1.0
-Release: 17%{?dist}
+Release: 18%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -69,6 +69,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Thu Sep 22 2011 Adam Jackson <ajax@redhat.com> 9.1.0-18
+- redhat-hardened-cc1: Inject -fPIE, not -fPIC.
+  cf. http://lists.fedoraproject.org/pipermail/devel/2011-September/157365.html
+
 * Fri Sep 16 2011 Adam Jackson <ajax@redhat.com> 9.1.0-17
 - Expose %%_hardening_{c,ld}flags independently to make it easier for
   packages to apply them to selected components