diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 807047b4e99a44731e550b11ecf52be2d129ec7f..9338047f6dd5e7fd0807936952596fed73d428c1 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1021,12 +1021,7 @@ StringXNumber MeshOptions_Number[] = {
   { F|O, "OptimizeNetgen" , opt_mesh_optimize_netgen , 0. , 
     "Optimize the mesh using Netgen to improve the quality of tetrahedral elements" },
 
-  { F|O, "Partitioner" , opt_mesh_partition_partitioner,
-#if defined(HAVE_CHACO)
-    1.,
-#else
-    2.,
-#endif
+  { F|O, "Partitioner" , opt_mesh_partition_partitioner, 2. ,
     "Partitioner software (1=Chacho, 2=METIS)" },
   { F|O, "Points" , opt_mesh_points , 0. , 
     "Display mesh vertices (nodes)?" },
diff --git a/Makefile b/Makefile
index 1c64e4e8ab0f2a7a8beaffdca61615bf0d440823..e4168029f58b85e218017e41cb341d86acdefe82 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,7 @@ GMSH_SHORT_LICENSE = "GNU General Public License"
 GMSH_VERSION_FILE = Common/GmshVersion.h
 GMSH_DATE = `date "+%Y%m%d"`
 
-GMSH_API = Geo/GModel.h\
-           Geo/GEntity.h Geo/GPoint.h\
+GMSH_API = Geo/GModel.h Geo/GEntity.h Geo/GPoint.h\
            Geo/GVertex.h Geo/GEdge.h Geo/GEdgeLoop.h Geo/GFace.h Geo/GRegion.h\
            Geo/MVertex.h Geo/MEdge.h Geo/MFace.h Geo/MElement.h\
            Geo/discreteVertex.h Geo/discreteEdge.h Geo/discreteFace.h Geo/discreteRegion.h\