diff --git a/ChangeLog b/ChangeLog
index fa95db9bb..f42d20e81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-13  Eric Anholt  <anholt@FreeBSD.org>
+
+	* configure.ac:
+	* hw/xfree86/dri/Makefile.am:
+	Turn on DRI by default on Linux, NetBSD, FreeBSD, and fix the build of
+	the module for FreeBSD by setting some missing defines (XFree86Module,
+	IN_MODULE) in the dri directory.  Note that those missing defines should
+	be somewhere generic, since there are other consumers of them, but I
+	haven't figured out where.
+
 2005-09-13  Eric Anholt  <anholt@FreeBSD.org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index a8b37878a..bdce69f68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,6 +217,7 @@ AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" == xyes])
 AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" == xyes])
 AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" == xyes])
 
+DRI=no
 dnl it would be nice to autodetect these *CONS_SUPPORTs
 case $host_os in
   *freebsd*)
@@ -224,17 +225,22 @@ case $host_os in
 	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
 	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
 	AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console])
+	DRI=yes
 	;;
   *netbsd*)
 	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
 	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
 	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
+	DRI=yes
 	;;
   *openbsd*)
 	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
 	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
 	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
 	;;
+  *linux*)
+	DRI=yes
+	;;
 esac
 
 AC_MSG_CHECKING(for MMX capable platform)
@@ -312,7 +318,7 @@ AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ], [SCREENSAVER=$enableval
 AC_ARG_ENABLE(xdmcp,         [  --disable-xdmcp ], [XDMCP=$enableval], [XDMCP=auto])
 AC_ARG_ENABLE(xdm-auth-1,    [  --disable-xdm-auth-1 ], [XDMAUTH=$enableval], [XDMAUTH=auto])
 AC_ARG_ENABLE(glx,           [  --disable-glx ], [GLX=$enableval], [GLX=yes])
-AC_ARG_ENABLE(dri,           [  --enable-dri ], [DRI=$enableval], [DRI=no])
+AC_ARG_ENABLE(dri,           [  --enable-dri ], [DRI=$enableval])
 AC_ARG_ENABLE(xinerama,	     [  --disable-xinerama ], [XINERAMA=$enableval], [XINERAMA=yes])
 AC_ARG_ENABLE(xf86vidmode,   [  --disable-xf86vidmode ], [XF86VIDMODE=$enableval], [XF86VIDMODE=yes])
 AC_ARG_ENABLE(xf86misc,      [  --disable-xf86misc ], [XF86MISC=$enableval], [XF86MISC=yes])
diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am
index 68eac1d40..ee665f8d7 100644
--- a/hw/xfree86/dri/Makefile.am
+++ b/hw/xfree86/dri/Makefile.am
@@ -7,6 +7,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
                    -I$(top_builddir)/GL/include \
 		   -I@MESA_SOURCE@/include \
                    -DHAVE_XORG_CONFIG_H \
+		   -DXFree86Module -DIN_MODULE \
                    @DRIPROTO_CFLAGS@ \
                    @LIBDRM_CFLAGS@
 libdri_la_LDFLAGS = -module -avoid-version