@@ -91,11 +91,12 @@
   -update-meta            : update the tests metadata for all tests
   -env2file fname         : write the environment to fname.csh and fname.sh
   -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are
                                  overwritten by values set in config files.
   -archive                : archive tests, use -target, :runname, -itempatt and -testpatt
-  -server                 : start the server (reduces contention on megatest.db)
+  -server -|hostname      : start the server (reduces contention on megatest.db), use
+                            - to automatically figure out hostname
 
 Spreadsheet generation
   -extract-ods fname.ods  : extract an open document spreadsheet from the database
   -pathmod path           : insert path, i.e. path/runame/itempath/logfile.html
                             will clear the field if no rundir/testname/itempath/logfile
@@ -151,10 +152,11 @@
 			":value"
 			":expected"
 			":tol"
 			":units"
 			;; misc
+			"-server"
 			"-extract-ods"
 			"-pathmod"
 			"-env2file"
 			"-setvars"
 			"-debug" ;; for *verbosity* > 2
@@ -178,11 +180,10 @@
 			"-keepgoing"
 			"-usequeue"
 			"-rebuild-db"
 			"-rollup"
 			"-update-meta"
-			"-server"
 
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
 		       )
 		 args:arg-hash
@@ -389,11 +390,11 @@
 ;;======================================================================
 (if (args:get-arg "-server")
     (let* ((toppath (setup-for-run))
 	   (db      (if toppath (open-db) #f)))
       (if db 
-	  (server:start db)
+	  (server:start db (args:get-arg "-server"))
 	  (debug:print 0 "ERROR: Failed to setup for megatest"))))
 
 ;;;======================================================================
 ;; Rollup into a run
 ;;======================================================================