diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 0d77b09..a428a9d 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -3,7 +3,7 @@ Sat Jul 23 20:13:08 UTC 2016 - antoine.belvire@laposte.net
 
 - Fix Firefox crash on startup on i586 (boo#986541):
   * Add -fno-delete-null-pointer-checks and
-    -fno-inline-small-functions to CLFAGS
+    -fno-inline-small-functions to CFLAGS
 
 -------------------------------------------------------------------
 Tue Jul 19 20:12:11 UTC 2016 - mailaender@opensuse.org
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index e7505b8..dc7d60d 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -293,8 +293,11 @@ export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_GOOGLE_API_KEY=%{_google_api_key}
-# boo#986541: add -fno-delete-null-pointer-checks and -fno-inline-small-functions to fix Firefox on i586
-export CFLAGS="%{optflags} -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-inline-small-functions"
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+# boo#986541: add -fno-delete-null-pointer-checks and -fno-inline-small-functions for gcc6
+%if 0%{?suse_version} > 1320
+export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -fno-inline-small-functions"
+%endif
 %ifarch %arm
 export CFLAGS="${CFLAGS/-g / }"
 %endif