diff --git a/run.pl b/run.pl
index f3c1d210c..b5f7a968e 100644
--- a/run.pl
+++ b/run.pl
@@ -1,3 +1,7 @@
 :- use_module(server).
 
-:- initialization server(3050).
+% Using `localhost:3050`, we only bind to localhost interface!
+% Use plain `3050` (or any port number you like) to make the server
+% accessible from all network interfaces.
+
+:- initialization server(localhost:3050).
diff --git a/server.pl b/server.pl
index fa0092bed..ace494b17 100644
--- a/server.pl
+++ b/server.pl
@@ -1,3 +1,32 @@
+/*  Part of SWI-Prolog
+
+    Author:        Jan Wielemaker
+    E-mail:        J.Wielemaker@cs.vu.nl
+    WWW:           http://www.swi-prolog.org
+    Copyright (C): 2014-2016, VU University Amsterdam
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    As a special exception, if you link this library with other files,
+    compiled with a Free Software compiler, to produce an executable, this
+    library does not by itself cause the resulting executable to be covered
+    by the GNU General Public License. This exception does not however
+    invalidate any other reasons why the executable file might be covered by
+    the GNU General Public License.
+*/
+
 :- module(server,
 	  [ server/0,
 	    server/1				% ?Port
@@ -6,6 +35,21 @@
 :- use_module(library(http/http_dispatch)).
 :- use_module(swish).
 
+/** <module> Load the SWISH server for local usage
+
+This module loads the SWISH server for default local usage, i.e., mostly
+for developing SWISH. The file `daemon.pl` can be used as a start to run
+it as a server process.
+
+This file is normally used from  `run.pl`,   which  is started like this
+from   the   shell   to   start   the   SWISH   server   accessible   on
+http://localhost:3050/
+
+    swipl run.pl
+
+@see	run.pl and daemon.pl
+*/
+
 %%   server is det.
 %%   server(?Port) is det.
 %
@@ -15,7 +59,7 @@
 %    interface.
 
 server :-
-	server(3050).
+	server(localhost:3050).
 server(Port) :-
 	http_server(http_dispatch,
 		    [ port(Port),