diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am
index eb92a9994..9046c1476 100644
--- a/hw/xgl/Makefile.am
+++ b/hw/xgl/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . $(XGLX_DIRS)
+SUBDIRS = . $(XGLX_DIRS) $(XEGL_DIRS)
 
 INCLUDES =		   \
 	@XGL_INCS@	   \
diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am
index 0a8a736a7..d08bd8d21 100644
--- a/hw/xgl/egl/Makefile.am
+++ b/hw/xgl/egl/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES =		    \
 	@XGL_INCS@	    \
-	@XEGLSERVER_CFLAGS@ \
 	@XSERVER_CFLAGS@
 
 bin_PROGRAMS = Xegl
@@ -9,6 +8,7 @@ Xegl_SOURCES = xegl.c xeglinput.c kinput.c evdev.c
 
 Xegl_LDADD =	          \
 	@XGL_LIBS@        \
+	@XEGL_LIBS@       \
 	@XEGLSERVER_LIBS@ \
 	@XSERVER_LIBS@