diff --git a/ChangeLog b/ChangeLog
index 19737c74a..0c98a5e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-28  Kristian Høgsberg  <krh@redhat.com>
+
+	* configure.ac: 
+	* GL/glx/Makefile.am: Fix a couple of typos.
+
 2006-03-27  Aaron Plattner  <aplattner@nvidia.com>
 
 	* hw/xfree86/common/xf86Module.h:
diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 6e586f8d6..fd8a59bd0 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -17,7 +17,7 @@ AM_CFLAGS = \
 	@MODULE_DEFINES@ \
 	@LOADER_DEFINES@ \
 	-DNO_LIBCWRAPPER \
-	@GLX_DRI_DEFINES@
+	@GLX_DEFINES@
 
 # none yet
 #sdk_HEADERS =
diff --git a/configure.ac b/configure.ac
index da4bce125..359522c1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,7 +394,6 @@ AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-
 AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
 AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]), [AIGLX=$enableval], [AIGLX=yes])
 AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: disabled)]), [GLX_USE_TLS=$enableval], [GLX_USE_TLS=no])
-GLX_USE_TLS
 AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval])
 AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes])
 AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes])