diff --git a/ChangeLog b/ChangeLog
index 9d83525114..28a476094c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-03  Derek Atkins  <derek@ihtfp.com>
+
+	* configure.in: error out on g-wrap-1.3, gcc4, and error-on-warning.
+	  Fixes #330615.
+
 2006-03-02  Joshua Sled  <jsled@asynchronous.org>
 
 	* src/gnc-ui.h: Fix SXEDITOR help target id.  Bug#128857.
diff --git a/configure.in b/configure.in
index e9a506b312..737c449f93 100644
--- a/configure.in
+++ b/configure.in
@@ -2023,7 +2023,7 @@ then
     [  --disable-error-on-warning    disable treating compile warnings as errors],
     [case "${enableval}" in
        yes) warnFLAGS="${warnFLAGS} -Werror" ;;
-       no)  ;;
+       no)  gnc_error_on_warning=no ;;
        *) AC_MSG_ERROR(bad value ${enableval} for --enable-error-on-warning) ;;
      esac],
        [  warnFLAGS="${warnFLAGS} -Werror" ])
@@ -2042,6 +2042,20 @@ then
 	warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement -Wno-pointer-sign"
 	# rpmbuild on FC4 forces this flag. Can't hurt to always compile with it.
 	warnFLAGS="${warnFLAGS} -D_FORTIFY_SOURCE=2"
+	if test "x$gnc_error_on_warning" = x -a $gwrap_major_version = 1 -a $gwrap_minor_version -lt 9 ; then
+	    # This is g-wrap 1.3 + gcc4 + --enable-error-on-warning
+	    AC_MSG_ERROR([
+
+  Sorry, your current configuration will not compile.  You are
+  running g-wrap 1.3.x, GCC4, and --enable-error-on-warning, which
+  do not work together.  You have three options:  You can update
+  g-wrap to 1.9.6, you can downgrade gcc to GCC3, or you can
+  --disable-error-on-warning on the configure line.  We recommend
+  you update g-wrap to 1.9.6 so gnucash can compile cleanly on GCC4
+  You can find it at http://www.nongnu.org/g-wrap/ .
+
+])
+	  fi
 	fi
      fi
   fi