diff --git a/ChangeLog b/ChangeLog
index 54721dfb3..96e0aea30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-12  Bradford Hovinen  <hovinen@helixcode.com>
+
+	* configure.in (CFLAGS): Set CFLAGS to -O2 -g -Wall by default
+
 2000-09-10  Bradford Hovinen  <hovinen@helixcode.com>
 
 	* libcapplet/capplet-widget.h (struct _CappletWidget):
diff --git a/configure.in b/configure.in
index adf3b8439..69adc4a35 100644
--- a/configure.in
+++ b/configure.in
@@ -35,9 +35,6 @@ AC_SUBST(XML_CFLAGS)
 
 AM_PATH_LIBGLADE(,,"gnome")
 
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-
 AC_CHECK_HEADERS(dlfcn.h dl.h)
 AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl",[
 AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld",[
@@ -78,6 +75,11 @@ echo "ftp://www.rasterman.com/pub/enlightenment/"
 echo "ftp://ftp.labs.redhat.com/pub/imlib/"
 AC_MSG_ERROR([Fatal Error: no Imlib detected.])])
 
+CFLAGS="-O2 -g -Wall $CFLAGS"
+
+AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
+
 AC_OUTPUT([
 control-center.spec
 Makefile