@@ -664,11 +664,11 @@
 	 (last-db-time (if do-not-use-db-file-timestamps
 			   0
 			   (dboard:rundat-last-db-time run-dat)))
 	 (db-path      (or (dboard:rundat-db-path run-dat)
 			   (let* ((db-dir (common:get-db-tmp-area))
-				  (db-pth (conc db-dir "/.megatest/main.db")))
+				  (db-pth (conc db-dir "/" *dbdir* "/main.db")))
 			     (dboard:rundat-db-path-set! run-dat db-pth)
 			     db-pth)))
 	 (db-mod-time  (common:lazy-sqlite-db-modification-time db-path))
 	 (db-modified  (>= db-mod-time last-db-time))
 	 (multi-get    (> (dboard:rundat-run-data-offset run-dat) 0))  ;; multi-get in progress
@@ -3792,11 +3792,11 @@
 (stop-the-train)
 
 (define (main)
   ;; (print "Starting dashboard main")
     
-  (let* ((mtdb-path (conc *toppath* "/.megatest/main.db"))
+  (let* ((mtdb-path (conc *toppath* "/" *dbdir* "/main.db"))
          (target (args:get-arg "-target"))
          (commondat       (dboard:commondat-make)))
     (if target
         (begin
           (args:remove-arg-from-ht "-target")
@@ -3889,11 +3889,11 @@
 
 
 ;; Sync to tmp only if in read-only mode.
 
 (define (sync-db-to-tmp tabdat)
-  (let* ((db-file "./.megatest/main.db"))
+  (let* ((db-file (conc "./" *dbdir "/main.db")))
     (if (and (not (file-write-access? db-file)) ( > (current-seconds) (+ last-copy-time 5)))
       (begin
         (db:multi-db-sync (db:setup #f) 'old2new)
         (set! last-copy-time (current-seconds))
       )