diff -aurN gnome-control-center-2.25.92.orig/Makefile.am gnome-control-center-2.25.92/Makefile.am
--- gnome-control-center-2.25.92.orig/Makefile.am	2009-03-13 19:05:05.000000000 +0100
+++ gnome-control-center-2.25.92/Makefile.am	2009-03-13 19:18:22.000000000 +0100
@@ -13,4 +13,4 @@
 	MAINTAINERS \
 	gnome-doc-utils.make
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb --disable-desktop-update
diff -aurN gnome-control-center-2.25.92.orig/configure.in gnome-control-center-2.25.92/configure.in
--- gnome-control-center-2.25.92.orig/configure.in	2009-03-13 19:05:05.000000000 +0100
+++ gnome-control-center-2.25.92/configure.in	2009-03-13 19:19:56.000000000 +0100
@@ -278,6 +278,17 @@
                    enable_update_mimedb=yes)
 AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
 
+dnl =======================================
+dnl Update Desktop Database
+dnl =======================================
+
+AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
+
+AC_ARG_ENABLE(desktop-update,
+   AC_HELP_STRING([--disable-desktop-update],
+                   [do not update desktop database after installation]),,
+                   enable_desktop_update=yes)
+AM_CONDITIONAL(ENABLE_DESKTOP_UPDATE, test x$enable_desktop_update = xyes)
 
 AC_CONFIG_FILES([
 Makefile
diff -aurN gnome-control-center-2.25.92.orig/font-viewer/Makefile.am gnome-control-center-2.25.92/font-viewer/Makefile.am
--- gnome-control-center-2.25.92.orig/font-viewer/Makefile.am	2009-03-13 19:05:05.000000000 +0100
+++ gnome-control-center-2.25.92/font-viewer/Makefile.am	2009-03-13 19:23:35.000000000 +0100
@@ -28,11 +28,15 @@
 install-gconf-schemas:
 endif
 
+if ENABLE_DESKTOP_UPDATE
 install-desktop-database: install-desktopDATA
-	update-desktop-database $(DESTDIR)$(desktopdir)
+	$(UPDATE_DESKTOP_DATABASE) $(DESTDIR)$(desktopdir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache
+else
+install-desktop-database:
+endif
 
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_DIRECTORY_RULE@
