diff --git a/GL/Makefile.am b/GL/Makefile.am
index 3b3e74d09..3705e0e91 100644
--- a/GL/Makefile.am
+++ b/GL/Makefile.am
@@ -3,3 +3,5 @@ SUBDIRS = glx mesa
 # someone could get really crazy someday and add support for the SI...
 
 # xwin/darwin/xfree86 have their accel support under the DDX
+
+EXTRA_DIST = symlink-mesa.sh
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 1a237f728..129ab825c 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -17,8 +17,12 @@ INCLUDES = -I@MESA_SOURCE@/include \
 # terribly gross hack.  i need a shower now.
 AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server
 
-nodist_libX_la_SOURCES = xf86glx.c \
+libX_la_SOURCES = xf86glx.c \
                   xf86glx_util.c \
+                  xf86glx_util.h \
+                  xf86glxint.h
+
+nodist_libX_la_SOURCES = \
                   xm_api.c \
 		  xm_buffer.c \
                   xm_dd.c \
diff --git a/miext/cw/Makefile.am b/miext/cw/Makefile.am
index 9380ae8f2..6b6188b62 100644
--- a/miext/cw/Makefile.am
+++ b/miext/cw/Makefile.am
@@ -5,4 +5,5 @@ AM_CFLAGS = $(DIX_CFLAGS)
 libcw_la_SOURCES = 	\
 	cw.c		\
 	cw_ops.c	\
-	cw_render.c		
+	cw_render.c     \
+        cw.h