diff --git a/ChangeLog b/ChangeLog
index b27cd2722..eb9fe1c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-09  Matthias Hopf  <mhopf@suse.de>
+
+	* configure.ac: Do Xorg configure checks for Xgl only as well
+
 2006-03-08  Eric Anholt  <anholt@FreeBSD.org>
 
 	* exa/exa.c: (exaGetPixmapOffset), (exaPixmapIsOffscreen),
diff --git a/configure.ac b/configure.ac
index fb74f37a5..02032da9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -994,7 +994,7 @@ xorg_bus_ppcpci=no
 xorg_bus_sparcpci=no
 xorg_bus_sparc=no
 
-if test "x$XORG" = xyes; then
+if test "x$XORG" = xyes -o "x$XGL" = 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"