diff --git a/ChangeLog b/ChangeLog
index 7c7c3a557..69e7fe499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* GL/glx/Makefile.am:
+	Add GL_CFLAGS so that GLX can find its proto headers when using
+	separate build dirs.
+
 2005-11-13  Alan Coopersmith  <alan.coopersmith@sun.com>
 
 	* configure.ac: 
diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 5a0c2bad8..6d430a325 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libglx.la
 
-AM_CFLAGS = $(DIX_CFLAGS) -I@MESA_SOURCE@/include
+AM_CFLAGS = @DIX_CFLAGS@ @GL_CFLAGS@ -I@MESA_SOURCE@/include
 
 # none yet
 #sdk_HEADERS =