diff --git a/ChangeLog b/ChangeLog
index 9f9bb3ea0..6e64c3292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* Xext/Makefile.am:
 	Spell it XINERAMA_SRCS, not PANORAMIX_SRCS.
 
+	* GL/mesa/X/Makefile.am:
+	Build libglx correctly when not building the Xorg DDX.
+
 2005-12-12  Alan Coopersmith  <alan.coopersmith@sun.com>
 
 	* hw/xfree86/os-support/solaris/sun_kbdEv.c: 
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 46b7e82f2..e51f9e8f3 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -16,7 +16,10 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(top_srcdir)/GL/include \
            -I$(top_srcdir)/hw/xfree86/os-support
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+# -DXFree86Server is required because the X11 driver in Mesa thinks that
+# symbol means "being built in the server"
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
+            -DXFree86Server
 
 libX_la_SOURCES = xf86glx.c \
                   xf86glx_util.c \