diff --git a/config/ChangeLog b/config/ChangeLog
index ca70c0fb15..843b1afe8b 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-06  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* lyxinclude.m4: Turn exceptions on for gcc (read: don't turn them
+	off)
+
 2006-03-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* lyxinclude.m4: Remove support for versions of GCC older than 3.1
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index bf2a2a37d5..0def2730d3 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -254,10 +254,10 @@ if test x$GXX = xyes; then
     fi
   fi
   case $gxx_version in
-      3.1*)    AM_CXXFLAGS="-finline-limit=500 -fno-exceptions";;
-      3.2*|3.3*)    AM_CXXFLAGS="-fno-exceptions";;
+      3.1*)    AM_CXXFLAGS="-finline-limit=500 ";;
+      3.2*|3.3*)    AM_CXXFLAGS="";;
       3.4*|4.0*)
-          AM_CXXFLAGS="-fno-exceptions"
+          AM_CXXFLAGS=""
           test $enable_pch = yes && lyx_pch_comp=yes
           ;;
       *)       AM_CXXFLAGS="";;