diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index ebd6cc1d4aa349d6f6711b31fb7dda4f800f51d0..95cf39098c3f6acd8d7788256084b4674cc82f46 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -839,7 +839,7 @@ StringXNumber GeometryOptions_Number[] = {
 StringXNumber MeshOptions_Number[] = {
   { F|O, "Algorithm" , opt_mesh_algo2d , DELAUNAY_ISO ,
     "2D mesh algorithm (1=isotropic, 2=anisotropic, 3=triangle)" }, 
-  { F|O, "Algorithm3D" , opt_mesh_algo3d , DELAUNAY_ISO ,
+  { F|O, "Algorithm3D" , opt_mesh_algo3d , DELAUNAY_ISO /* FRONTAL_NETGEN */ ,
     "3D mesh algorithm (1=isotropic, 4=netgen, 5=tetgen)" }, 
   { F|O, "AngleSmoothNormals" , opt_mesh_angle_smooth_normals , 30.0 ,
     "Threshold angle below which normals are not smoothed" }, 
diff --git a/Common/GmshDefines.h b/Common/GmshDefines.h
index 36447c7cf24f75694a064a87ab83df92ca6026e4..d2e48de5c555bbb907e4dc40d438e9ad7d7b0445 100644
--- a/Common/GmshDefines.h
+++ b/Common/GmshDefines.h
@@ -61,8 +61,6 @@
 #define ENT_ALL      (ENT_POINT | ENT_LINE | ENT_SURFACE | ENT_VOLUME)
 
 // Mesh algorithms
-#define QUALITY_EDGES_BASED 1
-#define QUALITY_SIMPLEX_BASED 2
 #define DELAUNAY_ISO 1
 #define DELAUNAY_ANISO 2
 #define DELAUNAY_TRIANGLE 3
@@ -71,6 +69,5 @@
 
 #define TRANSFINI 1
 #define LIBRE     2
-#define ELLIPTIC  3
 
 #endif
diff --git a/doc/CREDITS b/doc/CREDITS
index 91778ec4528cc9904ff563cb0242e020e6346779..ede47a5913ffeac1f2e8cc249390ce12cad60506 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -1,4 +1,4 @@
-$Id: CREDITS,v 1.40 2006-11-30 17:37:12 geuzaine Exp $
+$Id: CREDITS,v 1.41 2006-12-03 17:57:43 geuzaine Exp $
 
              Gmsh is copyright (C) 1997-2007
 
@@ -77,11 +77,11 @@ subdirectory) copyright (C) 1994-2004, Joachim Sch"oberl: check the
 configuration options.
 
 This version of Gmsh may contain code (in the contrib/Triangle
-subdirectory) copyright (C) 1993, 1995, 1997, 1998, 2002, Jonathan
-Richard Shewchuk: check the configuration options.
+subdirectory) copyright (C) 1993, 1995, 1997, 1998, 2002, 2005
+Jonathan Richard Shewchuk: check the configuration options.
 
 This version of Gmsh may contain code (in the contrib/Tetgen
-subdirectory) copyright (C) 2002, 2004 Hang Si: check the
+subdirectory) copyright (C) 2002, 2004, 2005, 2006 Hang Si: check the
 configuration options.
 
 This version of Gmsh may contain code (in the contrib/Metis