diff --git a/config/ChangeLog b/config/ChangeLog
index 021c53bd5d..4afecb000a 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,16 +1,20 @@
+2002-06-10  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* lyxinclude.m4 (lyx_warning): turn off exceptions for 2.96 and 3.1
+
 2002-06-03  John Levon  <moz@compsoc.man.ac.uk>
 
 	* xforms.m4: don't insist on building with flimage linked
- 
+
 2002-06-03  John Levon  <moz@compsoc.man.ac.uk>
 
 	* xforms.m4: don't warn about missing flimage.h
- 
+
 2002-06-02  John Levon  <moz@compsoc.man.ac.uk>
 
 	* xforms.m4: moved out of lyxinclude.m4, some
 	  fixes for 1.0
- 
+
 2002-05-27  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* pkg.m4: new file
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index d99f2aaebb..cca5b39de7 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -209,9 +209,9 @@ if test x$GXX = xyes; then
       2.95.1)  CXXFLAGS="$lyx_opt -fpermissive";;
       2.95.2)  CXXFLAGS="$lyx_opt";;
       2.95.*)  CXXFLAGS="$lyx_opt";;
-      2.96*)  CXXFLAGS="$lyx_opt";;
+      2.96*)  CXXFLAGS="$lyx_opt -fno-exceptions";;
       3.0*)    CXXFLAGS="$lyx_opt";;
-      3.1*)    CXXFLAGS="$lyx_opt";;
+      3.1*)    CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;
       3.2*)    CXXFLAGS="$lyx_opt";;
       *)       CXXFLAGS="$lyx_opt";;
     esac
@@ -223,6 +223,7 @@ if test x$GXX = xyes; then
     case $gxx_version in
 	2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
 	2.96*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
+	3.1*)  CXXFLAGS="$CXXFLAGS -W -Wall -Winline";;
 	*)      CXXFLAGS="$CXXFLAGS -W -Wall";;
     esac
     if test $lyx_devel_version = yes ; then