diff --git a/ChangeLog b/ChangeLog
index e613eacde..03b2608c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-09  David Reveman  <davidr@novell.com>
+
+	* configure.ac: Back out last change, Xorg and Xgl servers cannot yet
+	be built at the same time.
+
+	* GL/mesa/Makefile.am (SUBDIRS): Remove glapi from SUBDIRS, it
+	shouldn't be there, glapi sources are now in $(top_srcdir)/GL/glx.
+
 2006-03-09  Matthias Hopf  <mhopf@suse.de>
 
 	* GL/glx/Makefile.am: find xf86dristr.h again.
diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am
index 18eebfc92..72b699476 100644
--- a/GL/mesa/Makefile.am
+++ b/GL/mesa/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
+SUBDIRS = main math array_cache swrast swrast_setup tnl shader X
 
 noinst_LTLIBRARIES = libGLcore.la
 
diff --git a/configure.ac b/configure.ac
index 2b10dbb12..9af04142c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1006,7 +1006,7 @@ xorg_bus_ppcpci=no
 xorg_bus_sparcpci=no
 xorg_bus_sparc=no
 
-if test "x$XORG" = xyes -o "x$XGL" = xyes; then
+if test "x$XORG" = xyes; then
 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"