diff --git a/hw/xfree86/glucose/Makefile.am b/hw/xfree86/glucose/Makefile.am
index 0b7cafa63..4e315e74d 100644
--- a/hw/xfree86/glucose/Makefile.am
+++ b/hw/xfree86/glucose/Makefile.am
@@ -13,6 +13,8 @@ libglucose_la_SOURCES = \
 	glucosemodule.c
 
 libglucose_la_LIBADD = \
-	../../../glucose/libglucose.la
+	../../../glucose/libglucose.la \
+	../../../xgl/libxgl.la
+
 
 include $(top_srcdir)/cpprules.in
diff --git a/xgl/Makefile.am b/xgl/Makefile.am
index 494a73beb..b386ce036 100644
--- a/xgl/Makefile.am
+++ b/xgl/Makefile.am
@@ -38,5 +38,3 @@ libxgl_la_SOURCES = \
 	xgltrap.c \
 	xglwindow.c \
 	xglxv.c
-
-libxgl_la_LIBADD = $(XGL_LIBS)