diff --git a/desktop-entry-mode-init.el b/desktop-entry-mode-init.el
new file mode 100644
index 0000000..3ce2f79
--- /dev/null
+++ b/desktop-entry-mode-init.el
@@ -0,0 +1,2 @@
+(autoload 'desktop-entry-mode "desktop-entry-mode" "Desktop Entry mode" t)
+(add-to-list 'auto-mode-alist '("\\.desktop\\(\\.in\\)?$" . desktop-entry-mode))
diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index dc641a6..3eca3b9 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -4,9 +4,10 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.bz2
+Source1: desktop-entry-mode-init.el
 License: GPLv2+
 Group: Development/Tools
 
@@ -54,6 +55,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
 mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.el
+touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc
 
 %files
 %defattr(-,root,root)
@@ -65,7 +68,9 @@ mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdi
 
 %files -n emacs-%{pkg}
 %defattr(-,root,root,-)
-%doc
+%{_emacs_sitestartdir}/desktop-entry-mode-init.el
+%ghost %{_emacs_sitestartdir}/desktop-entry-mode-init.elc
+%dir %{_emacs_sitelispdir}/%{pkg}
 %{_emacs_sitelispdir}/%{pkg}/*.elc
 
 %files -n emacs-%{pkg}-el
@@ -73,6 +78,9 @@ mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdi
 %{_emacs_sitelispdir}/%{pkg}/*.el
 
 %changelog
+* Sun Jan 30 2011 Ville Skyttä <ville.skytta@iki.fi> - 0.18-2
+- Add desktop-entry-mode-init.el, fix emacs site-start dir ownership.
+
 * Thu Jan 13 2011 Matthias Clasen <mclasen@redhat.com> - 0.18-1
 - Update to 0.18