diff --git a/emacs.spec b/emacs.spec
index 1882b10..06ba084 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -681,10 +681,17 @@ xargs -n 2 | while read first second; do
 done
 # install desktop file
 test -e etc/emacs.desktop || exit 1
-echo 'X-KDE-StartupNotify=false' >> etc/emacs.desktop
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacs*.desktop
 cp etc/images/icons/hicolor/32x32/apps/emacs.png $RPM_SOURCE_DIR/emacs.png
-%suse_update_desktop_file -r -i emacs TextEditor Utility
+for df in %{buildroot}%{_datadir}/emacs/%{version}/etc/emacs*.desktop
+do
+    test -e "$df" || break
+    base=${df##*/}
+    mv ${base} ${base}.orig
+    cp $df ${base}
+    echo 'X-KDE-StartupNotify=false' >> ${base}
+    rm -vf $df
+    %suse_update_desktop_file -r -i ${base%%.desktop} TextEditor Utility
+done
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 ln -sf %{_sysconfdir}/alternatives/ctags		%{buildroot}%{_bindir}/ctags
 ln -sf %{_sysconfdir}/alternatives/ctags.1%{ext_man}	%{buildroot}%{_mandir}/man1/ctags.1%{ext_man}
@@ -2083,10 +2090,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-preloaded.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-print.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-seq.elc
-%if %{without nativecomp}
-# %{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-cstr.el
-# %{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp.el
-%else
+%if %{with nativecomp}
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-cstr.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp.elc
 %endif