diff --git a/ChangeLog b/ChangeLog
index 718384f8d..7b355d60b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-17  Daniel Stone  <daniel@freedesktop.org>
+
+	* hw/xfree86/dixmods/Makefile.am:
+	Make DBE support conditional.  (Enrico Wiegelt)
+
 2006-05-15  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 151dc7782..dce7d9f0c 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -10,6 +10,10 @@ if XTRAP
 XTRAPMOD = libxtrap.la
 endif
 
+if DBE
+DBEMOD = libdbe.la
+endif
+
 module_LTLIBRARIES = libafb.la \
                      libcfb.la \
                      libcfb32.la \
@@ -18,8 +22,8 @@ module_LTLIBRARIES = libafb.la \
                      libshadow.la
 
 extsmoduledir = $(moduledir)/extensions
-extsmodule_LTLIBRARIES = libdbe.la \
-                         librecord.la \
+extsmodule_LTLIBRARIES = librecord.la \
+			 $(DBEMOD) \
                          $(GLXMODS) \
                          $(XTRAPMOD)