diff --git a/ChangeLog b/ChangeLog
index 2c979f32e..bb2906fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-19  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/eglx/Makefile.am: Fix the INCLUDE directives to
+	properly include the X11 backend headers.
+
+	* clutter/glx/Makefile.am: Add the libclutter-x11.la static
+	library to the LDADD directives.
+
 2008-05-19  Tomas Frydrych  <tf@openedhand.com>
 
 	* clutter/x11/clutter-x11.h:
diff --git a/clutter/eglx/Makefile.am b/clutter/eglx/Makefile.am
index 1ae1e1245..82d91f3e3 100644
--- a/clutter/eglx/Makefile.am
+++ b/clutter/eglx/Makefile.am
@@ -4,12 +4,14 @@ libclutterinclude_HEADERS = clutter-eglx.h
 INCLUDES = \
 	-DG_LOG_DOMAIN=\"ClutterEGL\" \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/clutter \
+	-I$(top_srcdir)/clutter/x11 \
+	-I$(top_builddir)/clutter \
 	$(CLUTTER_CFLAGS) \
 	$(CLUTTER_DEBUG_CFLAGS) \
 	$(GCC_FLAGS)
 
-LDADD = $(CLUTTER_LIBS) \
-	$(top_srcdir)/clutter/x11/libclutter-x11.la
+LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
 
 noinst_LTLIBRARIES = libclutter-eglx.la
 
diff --git a/clutter/glx/Makefile.am b/clutter/glx/Makefile.am
index 7bdefd070..dbfc97720 100644
--- a/clutter/glx/Makefile.am
+++ b/clutter/glx/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = \
 	$(CLUTTER_DEBUG_CFLAGS) \
 	$(GCC_FLAGS)
 
-LDADD = $(CLUTTER_LIBS)
+LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
 
 noinst_LTLIBRARIES = libclutter-glx.la