diff --git a/maloja/globalconf.py b/maloja/globalconf.py
index 938e542..16206a8 100644
--- a/maloja/globalconf.py
+++ b/maloja/globalconf.py
@@ -142,7 +142,7 @@ malojaconfig = Configuration(
 			"dev_mode":(tp.Boolean(),											"Enable developer mode",		False),
 		},
 		"Network":{
-			"host":(tp.String(),												"Host",							"::",					"Host for your server - most likely :: for IPv6 or 0.0.0.0 for IPv4"),
+			"host":(tp.String(),												"Host",							"*",					"Host for your server, e.g. '*' for dual stack, '::' for IPv6 or '0.0.0.0' for IPv4"),
 			"port":(tp.Integer(),												"Port",							42010),
 		},
 		"Technical":{
diff --git a/maloja/server.py b/maloja/server.py
index 4796838..63359eb 100644
--- a/maloja/server.py
+++ b/maloja/server.py
@@ -332,8 +332,9 @@ def run_server():
 
 	try:
 		#run(webserver, host=HOST, port=MAIN_PORT, server='waitress')
-		log(f"Listening on {HOST}:{PORT}")
-		waitress.serve(webserver, host=HOST, port=PORT, threads=THREADS)
+		listen = f"{HOST}:{PORT}"
+		log(f"Listening on {listen}")
+		waitress.serve(webserver, listen=listen, threads=THREADS)
 	except OSError:
 		log("Error. Is another Maloja process already running?")
 		raise