diff --git a/gimp.spec b/gimp.spec
index cae098a..3f072f5 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -17,7 +17,7 @@ Version: 	2.0.4
 %if %prever
 Release: 0.%{prever}.1
 %else
-Release: 3
+Release: 4
 %endif
 Epoch:		1
 License: 	GPL, LGPL
@@ -51,6 +51,8 @@ Requires: 	gtk2 >= 2.3.0
 Requires:	pango >= 1.4.0
 Requires:	fontconfig >= 2.2.0
 Requires:	gimp-print >= 4.2.0
+Requires(post): /sbin/ldconfig /usr/bin/update-desktop-database
+Requires(post): /sbin/ldconfig /usr/bin/update-desktop-database
 %if %prever
 Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{subver}/testing/gimp-%{version}%{prever}.tar.bz2
 %else
@@ -100,18 +102,18 @@ extensions.
 %patch1 -p1 -b .gimphelpmissing
 
 %build
-# use -32 or -64 postfixed binaries if available
-mkdir -p bin
-for prg in gdk-pixbuf-csource gdk-pixbuf-query-loaders gtk-query-immodules pango-querymodules; do
-	if a="$(type -path ${prg}-64 2>/dev/null)"; then
-		ln -snf "$a" bin/"$prg"
-	else
-		if a="$(type -path ${prg}-32 2>/dev/null)"; then
-			ln -snf "$a" bin/"$prg"
-		fi
-	fi
-done
-export PATH="$PATH:$PWD/bin"
+# # use -32 or -64 postfixed binaries if available
+# mkdir -p bin
+# for prg in gdk-pixbuf-csource gdk-pixbuf-query-loaders gtk-query-immodules pango-querymodules; do
+# 	if a="$(type -path ${prg}-64 2>/dev/null)"; then
+# 		ln -snf "$a" bin/"$prg"
+# 	else
+# 		if a="$(type -path ${prg}-32 2>/dev/null)"; then
+# 			ln -snf "$a" bin/"$prg"
+# 		fi
+# 	fi
+# done
+# export PATH="$PATH:$PWD/bin"
 
 libtoolize --copy --force
 aclocal -I m4macros
@@ -221,9 +223,15 @@ cat gimp-plugin-files gimp-all.lang > gimp.files
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+/usr/bin/update-desktop-database %{_datadir}/applications
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+    /usr/bin/update-desktop-database %{_datadir}/applications
+fi
 
 %files -f gimp.files
 %defattr(-, root, root, 0755)
@@ -339,6 +347,9 @@ cat gimp-plugin-files gimp-all.lang > gimp.files
 %changelog
 * Thu Aug 26 2004 Nils Philippsen <nphilipp@redhat.com>
 - add MimeType to desktop file
+- run update-desktop-database in %%post/%%postun
+- don't make stunts with -32 or -64 postfixed binaries anymore
+- require /sbin/ldconfig and /usr/bin/update-desktop-database
 
 * Tue Aug 10 2004 Nils Philippsen <nphilipp@redhat.com>
 - build requires libwmf-devel