diff --git a/xemacs.changes b/xemacs.changes
index 34957bb..526d7b1 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul  5 16:33:39 CEST 2007 - coolo@suse.de
+
+- put desktop file and icon into package
+
 -------------------------------------------------------------------
 Mon Jun 04 12:06:44 CEST 2007 - mfabian@suse.de
 
diff --git a/xemacs.desktop b/xemacs.desktop
new file mode 100644
index 0000000..f077a13
--- /dev/null
+++ b/xemacs.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=X Emacs
+GenericName=Text Editor
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=xemacs %f
+Icon=xemacs
+Type=Application
+Terminal=false
+X-KDE-StartupNotify=true
+X-KDE-AuthorizeAction=shell_access
diff --git a/xemacs.png b/xemacs.png
new file mode 100644
index 0000000..5e1bbab
--- /dev/null
+++ b/xemacs.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7729621c961187d533143d795d7c50a492070c47548c6406985ebdcf5864ff8
+size 2152
diff --git a/xemacs.spec b/xemacs.spec
index 2cf8238..d011f62 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -29,14 +29,14 @@ BuildRequires:  xaw3d
 %define xlibraries /usr/X11R6/%{_lib}
 %endif
 URL:            http://www.xemacs.org
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          Productivity/Editors/Emacs
 Obsoletes:      xe_exec
 Prereq:         permissions
 Requires:       xemacs-info xemacs-packages ctags
 Autoreqprov:    on
 Version:        21.5.28
-Release:        4
+Release:        10
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -55,6 +55,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        ftp://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.28.tar.bz2
 Source1:        xe-list.el
 Source2:        fix-load-history.el
+Source3:        xemacs.desktop
+Source4:        xemacs.png
 Patch0:         xemacs.patch
 # keep in sync with the similar patch to the app-defaults in the main xemacs-packages package:
 Patch3:         xemacs-21.4.8-app-defaults.patch
@@ -442,11 +444,7 @@ cat xe-list-el-without-elc xe-list-elc-without-el xe-list-elc-with-el \
     >> xe-list-el-without-elc_xe-list-elc-without-el_xe-list-elc-with-el
 ##
 # install desktop file
-%if %suse_version > 820
 %suse_update_desktop_file -i xemacs TextEditor
-grep -v X-KDE-WMClass $RPM_BUILD_ROOT/usr/share/applications/xemacs.desktop > $RPM_BUILD_ROOT/usr/share/applications/xemacs.desktop.new
-mv $RPM_BUILD_ROOT/usr/share/applications/xemacs.desktop.new $RPM_BUILD_ROOT/usr/share/applications/xemacs.desktop
-%endif
 ##
 # do no include header files because RPMLINT complains about header files in non-devel
 # packages:
@@ -551,6 +549,8 @@ rm -rf $RPM_BUILD_ROOT/usr/lib/xemacs/%{version}/*-suse-linux/include/
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Thu Jul 05 2007 - coolo@suse.de
+- put desktop file and icon into package
 * Mon Jun 04 2007 - mfabian@suse.de
 - Bugzilla #279822: fix typo in site-start.el to make XEmacs
   start properly in Portuguese locale. Thanks to