diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 3cac14399f04ac0c27ae4c512e698ef3ce5fdba7..0621222d072995f8d7987155478922dab706a01b 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -111,7 +111,13 @@ StringXString MeshOptions_String[] = {
 } ;
 
 StringXString SolverOptions_String[] = {
+#if defined(WIN32) && !defined(__CYGWIN__)
+  // use TCP/IP sockets by default on "pure" Windows
   { F|O, "SocketName" , opt_solver_socket_name , "127.0.0.1:44122" ,
+#else
+  // use Unix sockets by default otherwise
+  { F|O, "SocketName" , opt_solver_socket_name , ".gmshsock" ,
+#endif
     "Name of socket (TCP/IP if it contains the `:' character, UNIX otherwise)" },
 
   { F|O, "Name0" , opt_solver_name0 , "GetDP" ,