diff --git a/ChangeLog b/ChangeLog
index ec3adfcce1..6ad40a631a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2002-10-19  Derek Atkins  <derek@ihtfp.com>
 	* gnome/gw-gnc-spec.scm -- add "#include <gnc-splash.h>"
-
+	* configure.in -- don't let GNOME_COMPILE_WARNINGS overwrite our list
+	
 2002-10-19  Christian Stimming  <stimming@tuhh.de>
 
 	* po/POTFILES.in: Update potfile.in for upcoming translations.
diff --git a/configure.in b/configure.in
index ae18c1083f..e76f451eb5 100644
--- a/configure.in
+++ b/configure.in
@@ -342,18 +342,6 @@ AC_ARG_ENABLE(error-on-warning,
    esac]
   [  CFLAGS="${CFLAGS} -Werror"; enable_compile_warnings=no ])
 
-# This has to come after AC_PROG_CC
-if test ${GCC}x = yesx
-then
-  # These two are because of g-wrap -- it can't avoid unused and uninitialized.
-  CFLAGS="${CFLAGS} -Wno-unused"
-  CFLAGS="${CFLAGS} -Wno-uninitialized"
-  # other flags...
-  CFLAGS="${CFLAGS} -Wmissing-prototypes"
-  CFLAGS="${CFLAGS} -Wmissing-declarations"
-  CFLAGS="${CFLAGS} -Werror-implicit-function-declaration"
-fi
-
 AC_ARG_ENABLE( debug,
   [  --enable-debug               compile with debugging flags set],
        CFLAGS="${CFLAGS} -g"
@@ -773,6 +761,22 @@ then
 
 fi
 
+###-------------------------------------------------------------------------
+### Additional compiler warnings (or not) if we're running GCC
+###-------------------------------------------------------------------------
+
+# This has to come after AC_PROG_CC _AND_ GNOME_COMPILE_WARNINGS
+if test ${GCC}x = yesx
+then
+  # These two are because of g-wrap -- it can't avoid unused and uninitialized.
+  CFLAGS="${CFLAGS} -Wno-uninitialized"
+  CFLAGS="${CFLAGS} -Wno-unused"
+  # other flags...
+  CFLAGS="${CFLAGS} -Wmissing-prototypes"
+  CFLAGS="${CFLAGS} -Wmissing-declarations"
+  CFLAGS="${CFLAGS} -Werror-implicit-function-declaration"
+fi
+
 ###-------------------------------------------------------------------------
 ### Stuff from Mac OS X Port
 ###-------------------------------------------------------------------------