diff --git a/config/ChangeLog b/config/ChangeLog
index fecf1d5c18..ac3437cfd9 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-24  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* lyxinclude.m4 (lyx_warning): enable exceptions and see what
+	happens.
+
 2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* lyxinclude.m4 (lyx_warning): add entry for gcc 3.1
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 7dd281dd6a..7d40f0ddd9 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -206,14 +206,13 @@ if test x$GXX = xyes; then
     CXXFLAGS="$ac_save_CXXFLAGS"
   else
     case $gxx_version in
-      2.95.1)  CXXFLAGS="$lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
-      2.95.2)  CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";;
-      2.95.*)  CXXFLAGS="$lyx_opt -fno-exceptions";;
-      2.96*)  CXXFLAGS="$lyx_opt -fno-exceptions";;
-      3.0*)    CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";;
-      3.1*)    CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";;
-      *2.91.*) CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";;
-      *)       CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";;
+      2.95.1)  CXXFLAGS="$lyx_opt -fpermissive";;
+      2.95.2)  CXXFLAGS="$lyx_opt";;
+      2.95.*)  CXXFLAGS="$lyx_opt";;
+      2.96*)  CXXFLAGS="$lyx_opt";;
+      3.0*)    CXXFLAGS="$lyx_opt";;
+      3.1*)    CXXFLAGS="$lyx_opt";;
+      *)       CXXFLAGS="$lyx_opt";;
     esac
     if test x$enable_debug = xyes ; then
 	CXXFLAGS="-g $CXXFLAGS"
@@ -229,8 +228,6 @@ if test x$GXX = xyes; then
       case $gxx_version in
 	  2.95.*) ;;
 	  2.96*) ;;
-	  2.97*) ;;
-	  *2.91*) ;;
 	  *) ;;
       esac
     fi