diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index d272ac44..a428a9d5 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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 CFLAGS
+
+-------------------------------------------------------------------
+Tue Jul 19 20:12:11 UTC 2016 - mailaender@opensuse.org
+
+- Update the appdata.xml file (replace Windows XP screenshot)
+
 -------------------------------------------------------------------
 Wed Jun 29 09:25:41 UTC 2016 - astieger@suse.com
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index f5c44fa2..dc7d60da 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -294,6 +294,10 @@ 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 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
diff --git a/firefox-appdata.xml b/firefox-appdata.xml
index ecad906d..88e0cfa4 100644
--- a/firefox-appdata.xml
+++ b/firefox-appdata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-
-<!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM
-BugReportURL: https://bugzilla.mozilla.org/show_bug.cgi?id=1071061
-SentUpstream: 2014-09-22
+<!--
+Upstream does not want to ship it https://bugzilla.mozilla.org/show_bug.cgi?id=1071061
+so maintain a stub in here.
 -->
 
 <application>
@@ -11,21 +9,14 @@ SentUpstream: 2014-09-22
   <metadata_license>CC0-1.0</metadata_license>
   <description>
     <p>
-      Bringing together all kinds of awesomeness to make browsing better for you.
-      Get to your favorite sites quickly – even if you don’t remember the URLs.
-      Type your term into the location bar (aka the Awesome Bar) and the autocomplete
-      function will include possible matches from your browsing history, bookmarked
-      sites and open tabs.
+     Mozilla Firefox is a standalone web browser, designed for standards
+     compliance and performance. Its functionality can be enhanced via a
+     plethora of addons.
     </p>
-    <!-- FIXME: Needs another couple of paragraphs -->
   </description>
-  <url type="homepage">http://www.mozilla.org/en-US/</url>
+  <url type="homepage">https://www.mozilla.org/firefox/</url>
   <screenshots>
-  <!-- FIXME: Needs an official up to date screenshot -->
-    <screenshot type="default">https://wiki.mozilla.org/images/e/e1/Bon_Echo_Beta_2_Screen_Shot_1.PNG</screenshot>
+    <screenshot type="default">https://addons.cdn.mozilla.net/user-media/previews/full/159/159648.png</screenshot>
   </screenshots>
-  <!-- FIXME: change this to an upstream email address for spec updates
-  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-   -->
 </application>