diff --git a/gio/ChangeLog b/gio/ChangeLog
index 6c2c067e0..8fd0dce64 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-10  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 555121 – Improved build-time handling of gio module-dir
+
+	* fam/Makefile.am: Use GIO_MODULE_DIR consistently.
+	* Makefile.am: Create the module dir.
+
 2008-10-09  Alexander Larsson  <alexl@redhat.com>
 
 	* gunixinputstream.c (g_unix_input_stream_read):
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 971bdebc7..be6568f8b 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -265,6 +265,7 @@ export_symbols = -export-symbols-regex '^g_.*'
 endif
 
 install-data-local: install-ms-lib install-def-file
+	$(mkinstalldirs) $(DESTDIR)$(GIO_MODULE_DIR)
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
 
diff --git a/gio/fam/Makefile.am b/gio/fam/Makefile.am
index b5ffefcab..29ae072de 100644
--- a/gio/fam/Makefile.am
+++ b/gio/fam/Makefile.am
@@ -5,7 +5,7 @@ NULL =
 module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'
 
 giomodule_LTLIBRARIES = libgiofam.la
-giomoduledir = $(libdir)/gio/modules
+giomoduledir = $(GIO_MODULE_DIR)
 
 libgiofam_la_SOURCES = 		\
 	fam-helper.c			\