diff --git a/ChangeLog b/ChangeLog
index 20b0d2b10f..48b12af856 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/Makefile.am: Fix ordering of subdirs.
+
 2007-11-28  Tor Lillqvist  <tml@novell.com>
 
 	A proper build of GNU libintl is supposed to export the variable
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 91b712984a..e960a07fba 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,13 +1,14 @@
 # Makefile.am for gtk+/gtk
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = theme-bits . tests
+xdgmimedir =
 
 if OS_UNIX
-SUBDIRS += xdgmime
+xdgmimedir += xdgmime
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
+SUBDIRS = theme-bits $(xdgmimedir) . tests
 DIST_SUBDIRS=theme-bits xdgmime
 
 if HAVE_CUPS