diff --git a/Makefile.am b/Makefile.am
index f07500d54..4ad298b70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,9 @@ endif
 if MFB
 MFB_DIR=mfb
 endif
+if GLX
+GLX_DIR=GL
+endif
 
 SUBDIRS=	\
 	include	\
@@ -42,6 +45,7 @@ SUBDIRS=	\
 	damageext \
 	$(XTRAP_DIR) \
 	$(COMPOSITE_DIR) \
+        $(GLX_DIR) \
 	hw
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 6ea1d159c..60de33057 100644
--- a/configure.ac
+++ b/configure.ac
@@ -675,6 +675,8 @@ AC_SUBST([libdir exec_prefix prefix])
 
 AC_OUTPUT([
 Makefile
+GL/Makefile
+GL/dri/Makefile
 include/Makefile
 afb/Makefile
 composite/Makefile
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index e67d14dd3..30e39716b 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -61,7 +61,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
 sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
                xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
                xf86cmap.h xf86fbman.h xf86str.h $(XISDKINCS) \
-               $(XVSDKINCS) atKeynames.h
+               $(XVSDKINCS) atKeynames.h xf86Version.h
 
 DISTCLEANFILES = xf86Build.h