diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes
index 79672d1..a3bc6d9 100644
--- a/glibc-testsuite.changes
+++ b/glibc-testsuite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 21 07:50:22 UTC 2015 - meissner@suse.com
+
+- also filter out -fstack-protector-strong
+
 -------------------------------------------------------------------
 Mon Jun 22 07:22:22 UTC 2015 - schwab@suse.de
 
diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec
index 45c908d..063d916 100644
--- a/glibc-testsuite.spec
+++ b/glibc-testsuite.spec
@@ -541,7 +541,7 @@ echo "#define GITID \"%{git_id}\"" >> version.h
 # Default CFLAGS and Compiler
 #
 BuildFlags="%{optflags} -U_FORTIFY_SOURCE"
-BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##')
+BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector[^ ]*##' -e 's#-ffortify=[0-9]*##')
 BuildCC="%__cc"
 BuildCCplus="%__cxx"
 add_ons=libidn
diff --git a/glibc-utils.changes b/glibc-utils.changes
index 79672d1..a3bc6d9 100644
--- a/glibc-utils.changes
+++ b/glibc-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 21 07:50:22 UTC 2015 - meissner@suse.com
+
+- also filter out -fstack-protector-strong
+
 -------------------------------------------------------------------
 Mon Jun 22 07:22:22 UTC 2015 - schwab@suse.de
 
diff --git a/glibc-utils.spec b/glibc-utils.spec
index 96ecac7..b923b2d 100644
--- a/glibc-utils.spec
+++ b/glibc-utils.spec
@@ -541,7 +541,7 @@ echo "#define GITID \"%{git_id}\"" >> version.h
 # Default CFLAGS and Compiler
 #
 BuildFlags="%{optflags} -U_FORTIFY_SOURCE"
-BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##')
+BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector[^ ]*##' -e 's#-ffortify=[0-9]*##')
 BuildCC="%__cc"
 BuildCCplus="%__cxx"
 add_ons=libidn
diff --git a/glibc.changes b/glibc.changes
index 79672d1..a3bc6d9 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 21 07:50:22 UTC 2015 - meissner@suse.com
+
+- also filter out -fstack-protector-strong
+
 -------------------------------------------------------------------
 Mon Jun 22 07:22:22 UTC 2015 - schwab@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index b404f9a..1d4b401 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -541,7 +541,7 @@ echo "#define GITID \"%{git_id}\"" >> version.h
 # Default CFLAGS and Compiler
 #
 BuildFlags="%{optflags} -U_FORTIFY_SOURCE"
-BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##')
+BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector[^ ]*##' -e 's#-ffortify=[0-9]*##')
 BuildCC="%__cc"
 BuildCCplus="%__cxx"
 add_ons=libidn