diff --git a/ChangeLog b/ChangeLog
index b125905a4..e303b240b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-29  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	Disable building LBX by default.
+
 2005-12-29  Dave Airlie  <airlied@linux.ie>
 
 	* hw/xfree86/os-support/bus/Pci.c: (pciByteSwap):
@@ -9,8 +14,7 @@
 	* hw/xfree86/os-support/bus/zx1PCI.c:
 	* hw/xfree86/os-support/xf86_OSlib.h:
 	Remove PowerMAX_OS define it never worked , it'll never work
-	again, finishes running joke of OLS2005
-	
+	again, finishes running joke of OLS2005	
 
 2005-12-28  Eric Anholt  <anholt@FreeBSD.org>
 
@@ -295,7 +299,7 @@
 	* configure.ac:
 	* hw/Makefile.am:
 	* include/kdrive-config.h.in:
-	Skeletal kdrive build system.  Totall non-functional atm.
+	Skeletal kdrive build system.  Totally non-functional atm.
 
 2005-12-26  Daniel Stone  <daniel@freedesktop.org>
 
diff --git a/configure.ac b/configure.ac
index fb72b9cf4..74fd41a86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,7 +387,7 @@ AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF8
 AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
 AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes])
 AC_ARG_ENABLE(xevie,          AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
-AC_ARG_ENABLE(lbx,            AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: auto)]), [LBX=$enableval], [LBX=auto])
+AC_ARG_ENABLE(lbx,            AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no])
 AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes])
 AC_ARG_ENABLE(cup,            AS_HELP_STRING([--disable-cup], [Build TOG-CUP extension (default: enabled)]), [CUP=$enableval], [CUP=yes])
 AC_ARG_ENABLE(evi,            AS_HELP_STRING([--disable-evi], [Build Extended-Visual-Information extension (default: enabled)]), [EVI=$enableval], [EVI=yes])