diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index af24a26c..0d77b09e 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Tue Jul 19 20:12:11 UTC 2016 - mailaender@opensuse.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index f5c44fa2..e7505b85 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -293,7 +293,8 @@ export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_GOOGLE_API_KEY=%{_google_api_key}
-export CFLAGS="%{optflags} -fno-strict-aliasing"
+# 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"
 %ifarch %arm
 export CFLAGS="${CFLAGS/-g / }"
 %endif