diff --git a/ChangeLog b/ChangeLog
index 6529b2bf8..27c6722df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* GL/mesa/X/Makefile.am:
+	Fix GL build when srcdir != builddir (Donnie Berkholz).
+
 2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 56b62e765..806e238f3 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../swrast_setup \
            -I../tnl \
            -I.. \
+           -I../../glx \
            -I$(top_srcdir)/GL/glx \
            -I$(top_srcdir)/GL/include \
            -I$(top_srcdir)/hw/xfree86/os-support