diff --git a/ChangeLog b/ChangeLog
index 3b2f17cf28..b0c8a70380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 
 1999-11-03  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
+	* acinclude.m4 (cross_compiling): add -fpermissive when gcc 2.95.x
+	is used.
+
 	* src/support/lyxstring.C: some changes from length() to rep->sz.
 	avoids a function call.
 
diff --git a/acinclude.m4 b/acinclude.m4
index 55cd033c9c..02a39591b5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -184,6 +184,7 @@ dnl Check the version of g++
   elif test $ac_cv_prog_cxx_g = yes; then
     case $gxx_version in
       2.7*) CXXFLAGS="$lyx_opt";;
+      2.95.*) CXXFLAGS="-g $lyx_opt -fno-exceptions -fno-rtti -fpermissive";;
       *)    CXXFLAGS="-g $lyx_opt -fno-exceptions -fno-rtti";;
     esac
   else