diff --git a/ChangeLog b/ChangeLog
index e45e1086f..0eda7f709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-27  Eric Anholt  <anholt@FreeBSD.org>
+
+	* hw/xfree86/dixmods/Makefile.am:
+	* hw/xgl/glx/Makefile.am:
+	Remove leftover variables for cfb24 build, and finish commenting out
+	Xglx standalone stuff, which some versions of automake get whiny about.
+
 2006-01-27  Alan Hourihane  <alanh@fairlite.demon.co.uk>
 
 	* hw/xfree86/scanpci/pci.ids:
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index e8c402879..6bfe0bd21 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -59,10 +59,6 @@ libcfb16_la_LDFLAGS = -avoid-version
 libcfb16_la_LIBADD = $(top_builddir)/cfb16/libcfb16.la
 libcfb16_la_SOURCES = cfb16module.c
 
-libcfb24_la_LDFLAGS = -avoid-version
-libcfb24_la_LIBADD = $(top_builddir)/cfb24/libcfb24.la
-libcfb24_la_SOURCES = cfb24module.c
-
 libcfb32_la_LDFLAGS = -avoid-version
 libcfb32_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la
 libcfb32_la_SOURCES = cfb32module.c
diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am
index 4bc0189a4..492921210 100644
--- a/hw/xgl/glx/Makefile.am
+++ b/hw/xgl/glx/Makefile.am
@@ -44,5 +44,5 @@ libxglx_la_SOURCES = \
 #	$(XGLXMODULES_LIBS) \
 #	-lXrandr
 #Xglx_programs	  = Xglx
-
-bin_PROGRAMS = $(Xglx_programs)
+#
+#bin_PROGRAMS = $(Xglx_programs)