diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index e3ef14fc1..830f17ac9 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -27,12 +27,12 @@ if INT10MODULE
 INT10_SUBDIR = int10
 endif
 
-SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \
+SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw glamor os-support parser \
 	  ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
 	  loader dixmods exa modes \
 	  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) doc man
 
-DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
+DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw glamor os-support \
                parser ramdac shadowfb vbe vgahw xaa \
                loader dixmods dri dri2 exa modes \
 	       utils doc man
diff --git a/hw/xfree86/glamor/Makefile.am b/hw/xfree86/glamor/Makefile.am
index 4c82b42b8..d691009eb 100644
--- a/hw/xfree86/glamor/Makefile.am
+++ b/hw/xfree86/glamor/Makefile.am
@@ -13,9 +13,12 @@ glamor_la_CFLAGS =					\
 	-I/usr/include/drm
 
 glamor_la_LDFLAGS =							\
-	-module -avoid-version -lEGL $(top_builddir)/glamor/libglamor.la -lGLEW
+	-module -avoid-version -L$(libdir) -lEGL $(top_builddir)/glamor/libglamor.la -lGLEW
 glamor_ladir = $(moduledir)/drivers
 glamor_la_SOURCES =				\
 	glamor.c				\
 	glamor_crtc.c				\
 	glamor_ddx.h
+
+glamor_la_DEPENDENCIES = 			\
+ $(top_builddir)/glamor/libglamor.la