diff --git a/gio/ChangeLog b/gio/ChangeLog
index 3632e0a22..ecc140cae 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-03  Alexander Larsson  <alexl@redhat.com>
+
+        * fam/Makefile.am:
+	Link to libglib and libgobject directly (#504879)
+	Patch from Sebastien Bacher
+
 2008-01-01  Wouter Bolsterlee  <wbolster@svn.gnome.org>
 
 	* gfile.c: Expanded the g_file_new_for_commandline_arg
diff --git a/gio/fam/Makefile.am b/gio/fam/Makefile.am
index c0463e61b..b5ffefcab 100644
--- a/gio/fam/Makefile.am
+++ b/gio/fam/Makefile.am
@@ -31,6 +31,8 @@ libgiofam_la_CFLAGS = \
 libgiofam_la_LDFLAGS = $(module_flags)
 libgiofam_la_LIBADD = \
 		$(top_builddir)/gio/libgio-2.0.la \
+		$(top_builddir)/gobject/libgobject-2.0.la \
+		$(top_builddir)/glib/libglib-2.0.la \
 		$(GLIB_LIBS) \
 		$(FAM_LIBS) \
 		$(NULL)