diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index ab6f023..beaf570 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 13 13:08:39 UTC 2011 - wr@rosenauer.org
+
+- rename desktop file for 11.4 and above (bnc#664211)
+
 -------------------------------------------------------------------
 Mon Jan 10 09:30:21 UTC 2011 - wr@rosenauer.org
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index 53478c1..902fcfe 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -2,7 +2,7 @@
 # spec file for package MozillaThunderbird (Version 3.1.7)
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#               2006-2010 Wolfgang Rosenauer <wr@rosenauer.org>
+#               2006-2011 Wolfgang Rosenauer <wr@rosenauer.org>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@ BuildRequires:  nss-shared-helper-devel
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
 %define mainversion 3.1.7
 Version:        %{mainversion}
-Release:        2
+Release:        1
 %define releasedate 2010120600
 Provides:       thunderbird = %{version}
 Summary:        The Stand-Alone Mozilla Mail Component
@@ -72,6 +72,11 @@ Requires:       mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
 %define progname thunderbird
 %define progdir %{_prefix}/%_lib/thunderbird
 %define libgssapi libgssapi_krb5.so.2
+%if %suse_version > 1130
+%define desktop_file_name thunderbird
+%else
+%define desktop_file_name %{name}
+%endif
 
 %description
 Mozilla Thunderbird is a redesign of the Mozilla Mail component. It is
@@ -134,7 +139,7 @@ symbols meant for upload to Mozilla's crash collector database.
 
 %package -n enigmail
 Version:        1.1.2
-Release:        8
+Release:        7
 License:        GPLv2+ ; MPLv1.1+
 Summary:        OpenPGP addon for Thunderbird and SeaMonkey
 Group:          Productivity/Networking/Email/Clients
@@ -275,7 +280,7 @@ ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT%{_bindir}/%{progname}
 # freedesktop 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
 # install add-plugins.sh
 sed "s:%%PROGDIR:%{progdir}:g" \
   %{SOURCE2} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh
@@ -343,7 +348,7 @@ for size in 16 22 24 32 48 256; do
   mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/
   ln -sf %{progdir}/chrome/icons/default/default$size.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{progname}.png
 done
-%suse_update_desktop_file %{name} Network Email GTK
+%suse_update_desktop_file %{desktop_file_name} Network Email GTK
 # excluded files
 rm -f $RPM_BUILD_ROOT%{progdir}/thunderbird
 rm -f $RPM_BUILD_ROOT%{progdir}/removed-files
@@ -446,7 +451,7 @@ exit 0
 %{progdir}/greprefs/
 %{progdir}/extensions/
 %{progdir}/isp/
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{desktop_file_name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{progname}.png
 %{_bindir}/%{progname}