diff --git a/Netgen/README b/Netgen/README
index 12dca8d3b79b90cc8187b8ecddc223e26ac31946..08e5573ac221fbb85447c6465774aabbb1fe00d7 100644
--- a/Netgen/README
+++ b/Netgen/README
@@ -7,6 +7,9 @@ Sch\"oberl's NETGEN mesh generator:
 - the file meshing/improve2.cpp was slightly modified to fix build
   problems on machines without TCL/TK
 
+- the file meshing/meshtype.hpp was slightly modified so that it
+  compiles with ISO-C++ complient compilers
+
 **IMPORTANT NOTICE** 
 
 NETGEN requires the boundary mesh to be oriented with exterior
diff --git a/Netgen/libsrc/meshing/meshtype.hpp b/Netgen/libsrc/meshing/meshtype.hpp
index 56cc5f902d7fbf67efd0dc4aff259ab9c184af87..363efd32267000f66885bf7e830e828073c757b1 100644
--- a/Netgen/libsrc/meshing/meshtype.hpp
+++ b/Netgen/libsrc/meshing/meshtype.hpp
@@ -35,7 +35,7 @@ enum ELEMENTTYPE { FREEELEMENT, FIXEDELEMENT };
 enum OPTIMIZEGOAL { OPT_QUALITY, OPT_CONFORM, OPT_REST, OPT_WORSTCASE, OPT_LEGAL };
 
 
-
+class Mesh; // Added by Christophe for Gmsh (ISO C++ forbids declaration of 'Mesh' with no type)
 
 // class CSGeometry;
 
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 1e9645207cf1ed970b7f21d508854a26393e2eb0..db93f6a84f41329b507423218c85e798cc4bea4c 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
 \input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.189 2005-09-02 15:56:24 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.190 2005-09-20 12:06:36 geuzaine Exp $
 @c
 @c Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 @c
@@ -3478,6 +3478,9 @@ the same for all other kinds of values.
 For all mesh and post-processing file formats, the reference elements are
 defined as follows:
 
+@c FIXME: changer la doc des faces pour les definir de maniere sensee
+@c sans butterflies.
+
 @example
 @group
 Point: