@@ -429,11 +429,11 @@
                           (set! sdat *server-info*)
                           (mutex-unlock! *heartbeat-mutex*)
                           (if (and sdat
 				   (not changed)
 				   (> (- (current-seconds) start-time) 2))
-			      (let* ((servinfodir (conc *toppath*"/.servinfo"))
+			      (let* ((servinfodir (server:get-servinfo-dir *toppath*)) ;; (conc *toppath*"/.servinfo"))
 				     (ipaddr      (car sdat))
 				     (port        (cadr sdat))
 				     (servinf     (conc servinfodir"/"ipaddr":"port)))
 				(set! servinfofile servinf)
 				(if (not (file-exists? servinfodir))
@@ -461,11 +461,11 @@
 				(debug:print-info 0 *default-log-port* "Still waiting, last-sdat=" last-sdat)
                                 (sleep 4)
 				(if (> (- (current-seconds) start-time) 120) ;; been waiting for two minutes
 				    (let* ((ipaddr  (car sdat))
 					   (port    (cadr sdat))
-					   (servinf (conc *toppath*"/.servinfo/"ipaddr":"port)))
+					   (servinf (conc (server:get-servinfo-dir *toppath*)"/"ipaddr":"port)))
 				      (debug:print-error 0 *default-log-port* "transport appears to have died, exiting server")
 				      ;; (delete-file* servinf) ;; handled by on-exit, can be removed
                                       #;(common:save-pkt `((action . died)
                                                          (T      . server)
                                                          (pid    . ,(current-process-id))