diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 5d8611c..f958f79 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -8,6 +8,10 @@ Tue Jan 11 06:13:40 UTC 2011 - wr@rosenauer.org
   (mozilla-shellservice.patch)
 - removed obsolete firefox-appname.patch (integrated into
   shellservice patch)
+- renamed desktop file to firefox.desktop for 11.4 and newer
+  (bnc#664211)
+- removed support for 10.3 and older from the spec file
+- removed obsolete "Ximian" categories from desktop file
 
 -------------------------------------------------------------------
 Mon Jan  3 17:35:46 CET 2011 - meissner@suse.de
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 6fee18b..47239b6 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -83,6 +83,11 @@ Requires:       %{name}-branding >= 4.0
 %define progname firefox
 %define progdir %{_prefix}/%_lib/%{progname}
 %define gnome_dir     %{_prefix}
+%if %suse_version > 1130
+%define desktop_file_name firefox
+%else
+%define desktop_file_name %{name}
+%endif
 ### build options
 %define branding 1
 %define localize 1
@@ -226,7 +231,10 @@ rm dist/bin/defaults/preferences/firefox-l10n.js
 make -C browser/installer STRIP=/bin/true
 # copy tree into RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{progdir}
-cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT/%{progdir}
+cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir}
+# remove some executable permissions
+find $RPM_BUILD_ROOT%{progdir} \
+     -name "*.js" -o -name "*.jsm" -o -name "*.rdf" | xargs chmod a-x
 mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins
 # install additional locales
 %if %localize
@@ -271,7 +279,7 @@ ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT%{_bindir}/%{progname}
 # desktop definition
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -m 644 %{SOURCE1} \
-   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+   $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_file_name}.desktop
 # additional mime-types
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
 cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{progname}.xml
@@ -291,7 +299,7 @@ for size in 16 32 48; do
          $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png
 done
 %endif
-%suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK
+%suse_update_desktop_file %{desktop_file_name} Network WebBrowser GTK
 # excludes
 rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini
 rm -f $RPM_BUILD_ROOT%{progdir}/removed-files
@@ -314,38 +322,18 @@ rm -rf %{_tmppath}/translations.*
 if [ -f usr/bin/update-mime-database ] ; then
   usr/bin/update-mime-database %{_datadir}/mime > /dev/null || :
 fi
-%if %suse_version >= 1030
 if [ -f usr/bin/update-desktop-database ] ; then
   usr/bin/update-desktop-database > /dev/null || :
 fi
-%else
-if [ -f opt/gnome/bin/update-mime-database ] ; then
-  opt/gnome/bin/update-mime-database > /dev/null || :
-fi
-%endif
-# move plugins to new location
-if [ "$1" = "2" ]; then
-  if [ -d /opt/MozillaFirefox/%{_lib}/plugins ]; then
-    rm -rf /opt/MozillaFirefox/%{_lib}/plugins/libnullplugin.so
-    cp -fud /opt/MozillaFirefox/%{_lib}/plugins/* %{progdir}/plugins
-    rm -rf /opt/MozillaFirefox/%{_lib}/plugins
-  fi
-fi
 exit 0
 
 %postun
 if [ -f usr/bin/update-mime-database ] ; then
   usr/bin/update-mime-database %{_datadir}/mime > /dev/null || :
 fi
-%if %suse_version >= 1030
 if [ -f usr/bin/update-desktop-database ] ; then
   usr/bin/update-desktop-database > /dev/null || :
 fi
-%else
-if [ -f opt/gnome/bin/update-mime-database ] ; then
-  opt/gnome/bin/update-mime-database > /dev/null || :
-fi
-%endif
 
 %files
 %defattr(-,root,root)
@@ -373,7 +361,7 @@ fi
 %{progdir}/crashreporter-override.ini
 %endif
 %{progdir}/chrome.manifest
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{desktop_file_name}.desktop
 %{_datadir}/mime/packages/%{progname}.xml
 %{_datadir}/pixmaps/firefox*
 %if %branding