diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index 0b37f73..6b0037a 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.10
-Release: 5
+Release: 6
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
 Patch0: desktop-file-utils-0.9-nogroup.patch
@@ -36,7 +36,7 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We don't want the vfs module yet
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libmenu*
@@ -46,10 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
+update-desktop-database %{_datadir}/applications || :
 
-%postun
-update-desktop-database %{_datadir}/applications
+%preun
+update-desktop-database %{_datadir}/applications || :
 
 %files
 %defattr(-,root,root)
@@ -57,6 +57,11 @@ update-desktop-database %{_datadir}/applications
 %{_datadir}/emacs/site-lisp/
 
 %changelog
+* Fri Feb 10 2006 Ray Strode <rstrode@redhat.com> - 0.10-6
+- call update-desktop-database in %%preun (bug 180898)
+- don't fail if update-desktop-database fails
+- don't use %%makeinstall
+
 * Fri Feb 10 2006 Ray Strode <rstrode@redhat.com> - 0.10-5
 - call update-desktop-database in %%post (bug 180898)