diff --git a/ChangeLog b/ChangeLog
index f5a21839e..1940c4b7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-06  Mike Kestner  <mkestner@novell.com>
+
+	* configure.in.in : always enable debug build in maintainer_mode.
+
 2005-05-06  Mike Kestner  <mkestner@novell.com>
 
 	* gdk/Pixbuf.custom : move the GetCallingAssembly invocations back out
diff --git a/configure.in.in b/configure.in.in
index 9055a423a..16a135d2e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -39,10 +39,14 @@ AC_CHECK_SIZEOF(void *, 4)
 
 CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
 
+if test "x$enable_maintainer_mode" = "xyes"; then
+DEBUG_FLAGS='-g'
+else
 DEBUG_FLAGS=
 AC_ARG_ENABLE(debug, [  --enable-debug          Build debugger (.mdb) files for dlls],
 	DEBUG_FLAGS='-g'
 )
+fi
 
 CSDEFINES='@VERSIONCSDEFINES@'
 CSFLAGS="$DEBUG_FLAGS $CSDEFINES"