diff --git a/ChangeLog b/ChangeLog
index 8c8332cbf..fa947b902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
 	Put DMX AC_CONDITIONALS at the top level, since they must always be
 	called.
 
+	* configure.ac:
+	* include/xorg-config.h.in:
+	* include/xorg-server.h.in:
+	Since we build vgahw unconditionally, always define WITH_VGAHW.
+
 2005-09-09  Jürg Billeter  <j@bitron.ch>
 
 	* configure.ac: use RGB_DB not RGB_PATH as that's what it's looking for
diff --git a/configure.ac b/configure.ac
index 9eb3eb9cc..2330bb338 100644
--- a/configure.ac
+++ b/configure.ac
@@ -723,6 +723,7 @@ if test "x$XORG" = xyes; then
 	# XXX do something smarter here.
 	AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader])                
 	AC_DEFINE(DLOPEN_SUPPORT, 1, [Use libdl-based loader])
+	AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
 	AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)])
 	AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)])
 	AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Location of configuration file])
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index a4089d892..241279588 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -76,4 +76,7 @@
 /* Define to 1 if unsigned long is 64 bits. */
 #undef _XSERVER64
 
+/* Building vgahw module */
+#undef WITH_VGAHW
+
 #endif /* _XORG_CONFIG_H_ */
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 08e66b690..713047f0b 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -223,4 +223,7 @@
 /* Define to 1 if unsigned long is 64 bits. */
 #undef _XSERVER64
 
+/* Building vgahw module */
+#undef WITH_VGAHW
+
 #endif /* _XORG_SERVER_H_ */