diff --git a/config/ChangeLog b/config/ChangeLog
index 206e51aee7..c38e0c5174 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-20  John Levon  <moz@compsoc.man.ac.uk>
+
+	* lyxinclude.m4: add -Wno-non-template-friend
+ 
 2002-06-20  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* pspell.m4: patch from Garst to help find pspell (bug 428) this
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index b43b37b78a..eb20c0c6f9 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -209,7 +209,7 @@ 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 -fno-exceptions";;
+      2.96*)  CXXFLAGS="$lyx_opt -fno-exceptions -Wno-non-template-friend";;
       3.0*)    CXXFLAGS="$lyx_opt";;
       3.1*)    CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;
       3.2*)    CXXFLAGS="$lyx_opt";;