@@ -68,11 +68,12 @@
 	 (ipaddrstr       (let ((ipstr (if (string=? "-" hostn)
 					   ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
 					   (server:get-best-guess-address hostname)
 					   #f)))
 			    (if ipstr ipstr hostn))) ;; hostname))) 
-	 (start-port      (open-run-close tasks:server-get-next-port tasks:open-db))
+	 (start-port      (or (portlogger:open-run-close portlogger:get-prev-used-port)
+			      (open-run-close tasks:server-get-next-port tasks:open-db)))
 	 (link-tree-path  (configf:lookup *configdat* "setup" "linktree")))
     ;; (set! db *inmemdb*)
     (root-path     (if link-tree-path 
 		       link-tree-path
 		       (current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!
@@ -428,11 +429,11 @@
 	    (set! *time-to-exit* #t)
 	    (if *inmemdb* (db:sync-touched *inmemdb* *run-id* force-sync: #t))
 	    ;;
 	    ;; start_shutdown
 	    ;;
-	    ( tasks:server-set-state! tdb server-id "shutting-down")
+	    (tasks:server-set-state! tdb server-id "shutting-down")
 	    (portlogger:open-run-close portlogger:set-port port "released")
 	    (thread-sleep! 5)
 	    (debug:print-info 0 "Max cached queries was    " *max-cache-size*)
 	    (debug:print-info 0 "Number of cached writes   " *number-of-writes*)
 	    (debug:print-info 0 "Average cached write time "