diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0831fd83477efe0f9e9976a00149d555988d68e5..e5d79c0600b2de4ac1712a5c49f0d601a32c9bd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,8 +51,8 @@ option(ENABLE_TETGEN "Enable Tetgen mesh generator" ON)
 option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF)
 
 set(GMSH_MAJOR_VERSION 2)
-set(GMSH_MINOR_VERSION 4)
-set(GMSH_PATCH_VERSION 3)
+set(GMSH_MINOR_VERSION 5)
+set(GMSH_PATCH_VERSION 0)
 set(GMSH_EXTRA_VERSION "" CACHE STRING "Gmsh extra version string")
 
 set(GMSH_VERSION "${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}")
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 60eb285d8e0e556db72ddb30381bc8edf1ab75d4..662442f229fc99b79e840f13ca1a2682e82af25b 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -82,6 +82,7 @@ void PrintUsage(const char *name)
   Msg::Direct("                          below which a swap is allowed");
   Msg::Direct("  -rand float           Set random perturbation factor");
   Msg::Direct("  -bgm file             Load background mesh from file");
+  Msg::Direct("  -check                Perform various consistency checks on mesh");
 #if defined(HAVE_FLTK)
   Msg::Direct("Post-processing options:");
   Msg::Direct("  -noview               Hide all views on startup");
diff --git a/doc/gmsh.1 b/doc/gmsh.1
index f4dd4cc2b2bf94f63da099b694ffbcd0403eb234..484384ddc002d80930d7991958e13f7c181e04da 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -1,4 +1,4 @@
-.TH Gmsh 1 "18 january 2009" "Gmsh 2.3" "Gmsh Manual Pages"
+.TH Gmsh 1 "8 february 2010" "Gmsh 2.5" "Gmsh Manual Pages"
 .UC 4
 .\" ********************************************************************
 .SH NAME
@@ -51,7 +51,7 @@ save all elements (and discard all physical group definitions).
 specify mesh output file name.
 .TP 4
 .B \-format string
-set output mesh format (msh, msh1, msh2, unv, vrml, stl, mesh, bdf, p3d, cgns, med).
+set output mesh format (msh, msh1, msh2, unv, vrml, stl, mesh, bdf, p3d, cgns, med, fea).
 .TP 4
 .B \-bin
 use binary format when available.
@@ -77,6 +77,7 @@ Set minimum characteristic length.
 .TP 4
 .B \-clmax float
 Set maximum characteristic length.
+.TP 4
 .B \-clcurv
 Compute characteristic lengths from curvatures.
 .TP 4
@@ -85,6 +86,9 @@ set random perturbation factor.
 .TP 4
 .B \-bgm file
 load the post-processing view in file as the current background mesh.
+.TP 4
+.B \-check
+perform various consistency checks on mesh.
 .\" ********************************************************************
 .SH POST-PROCESSING OPTIONS
 .TP 4
diff --git a/doc/gmsh.html b/doc/gmsh.html
index bd0c6999cdeea81fcfc4f45e60387439a2cd9c9f..7defd1ca3c7279a0c6ba9d6730ba02bc8693c830 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -26,7 +26,7 @@ generator with built-in pre- and post-processing facilities</h1>
 <p>
 <h3 align="center">Christophe Geuzaine and Jean-François Remacle</h3>
 <p>
-<h3 align=center>Version 2.4.2, September 21st 2009</h3>
+<h3 align=center>Version 2.5.0, ? 2010</h3>
 <p>
 <center>
   <a href="#Description">Description</a> |
@@ -65,13 +65,13 @@ License (GPL)</a>:
   <li>
     <span style="border: 1px dotted; padding: 3px;">
       <strong>Current stable release</strong>:
-      <a href="/gmsh/bin/Windows/gmsh-2.4.2-Windows.zip"><strong>Windows</strong></a>
+      <a href="/gmsh/bin/Windows/gmsh-2.5.0-Windows.zip"><strong>Windows</strong></a>
       (XP/Vista),
-      <a href="/gmsh/bin/Linux/gmsh-2.4.2-Linux.tgz"><strong>Linux</strong></a>,
+      <a href="/gmsh/bin/Linux/gmsh-2.5.0-Linux.tgz"><strong>Linux</strong></a>,
       (Intel glibc 2.3),
-      <a href="/gmsh/bin/MacOSX/gmsh-2.4.2-MacOSX.dmg"><strong>Mac OS X</strong></a> 
+      <a href="/gmsh/bin/MacOSX/gmsh-2.5.0-MacOSX.dmg"><strong>Mac OS X</strong></a> 
       (Intel 10.5) and
-      <a href="/gmsh/src/gmsh-2.4.2-source.tgz"><strong>source code</strong></a>
+      <a href="/gmsh/src/gmsh-2.5.0-source.tgz"><strong>source code</strong></a>
     </span>
     <p>
 
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 8fec6b72ea5d30ea0de9236177ae1d0c9e9fb415..0ee52fa64bf5599f3bb6c52ee252c031d5e997b2 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -876,6 +876,8 @@ Compute characteristic lengths from curvatures
 Set random perturbation factor
 @item -bgm file
 Load background mesh from file
+@item -check file
+Perform various consistency checks on mesh
 @end ftable
 
 @sp 1