diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 2e542c188a87a9b2606a1a0de2d7de04e283eebe..ddc5459d9765a81938e53cab4be18e282dbe956d 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -1,4 +1,4 @@
-// $Id: CommandLine.cpp,v 1.67 2006-01-06 00:34:20 geuzaine Exp $
+// $Id: CommandLine.cpp,v 1.68 2006-02-24 03:26:37 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -101,7 +101,7 @@ void Print_Usage(char *name){
   Msg(DIRECT, "  -a, -g, -m, -s, -p    Start in automatic, geometry, mesh, solver or post-processing mode");
 #endif
   Msg(DIRECT, "  -pid                  Print process id on stdout");
-  Msg(DIRECT, "  -listen               Always listen to external solver requests");
+  Msg(DIRECT, "  -listen               Always listen to incoming connection requests");
   Msg(DIRECT, "  -v int                Set verbosity level");
   Msg(DIRECT, "  -nopopup              Don't popup dialog windows in scripts");
   Msg(DIRECT, "  -string \"string\"      Parse option string at startup");
diff --git a/doc/gmsh.1 b/doc/gmsh.1
index 0288c90418295e09360bb78a0237b40c7da8537c..c6f187eb9920fda41207cc96835d1ea44def0977 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -1,4 +1,4 @@
-.\" $Id: gmsh.1,v 1.67 2005-11-24 20:01:26 geuzaine Exp $
+.\" $Id: gmsh.1,v 1.68 2006-02-24 03:26:37 geuzaine Exp $
 .TH Gmsh 1 "25 November 2005" "Gmsh 1.61" "Gmsh Manual Pages"
 .UC 4
 .\" ********************************************************************
@@ -129,7 +129,7 @@ start in automatic, geometry, mesh, solver or post-processing mode.
 print pid on stdout.
 .TP 4
 .B \-listen
-always listen to external solver requests.
+always listen to incoming connection requests.
 .TP 4
 .B \-v int
 set verbosity level.
diff --git a/doc/texinfo/command_line.texi b/doc/texinfo/command_line.texi
index 017fc951adabdea8dc71fadd2ac0a1bf01f106c7..9022ea45035ab1bf6389599d58eb7c12f13c87f3 100644
--- a/doc/texinfo/command_line.texi
+++ b/doc/texinfo/command_line.texi
@@ -88,7 +88,7 @@ Start in automatic, geometry, mesh, solver or post-processing mode
 @item -pid
 Print pid on stdout
 @item -listen
-Always listen to external solver requests
+Always listen to incoming connection requests.
 @item -v int
 Set verbosity level
 @item -nopopup
diff --git a/doc/texinfo/opt_solver.texi b/doc/texinfo/opt_solver.texi
index b6b06f13f9a69ad7b9745d9208c69af778979a4b..bf2796855a4dc125a870301bb6f02c2cdd5eb2ff 100644
--- a/doc/texinfo/opt_solver.texi
+++ b/doc/texinfo/opt_solver.texi
@@ -613,6 +613,11 @@ Command associated with the fifth button for solver 4@*
 Default value: @code{""}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Solver.AlwaysListen
+Always listen to incoming connection requests?@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Solver.MaximumDelay
 Maximum delay (in seconds) allowed for solver response@*
 Default value: @code{4}@*