@@ -3268,11 +3268,14 @@
       (load debugcontrolf)))
 
 (define (main)
   (if (not (args:get-arg "-skip-version-check"))
       (let ((th1 (make-thread common:exit-on-version-changed)))
-	(thread-start! th1)))
+	(thread-start! th1)
+	(if (> megatest-version (common:get-last-run-version-number))
+	    (debug:print-info 0 *default-log-port* "Version bump detected, blocking until db sync complete")
+	    (thread-join! th1))))
   (let* ((commondat       (dboard:commondat-make)))
     ;; Move this stuff to db.scm? I'm not sure that is the right thing to do...
     (cond 
      ((args:get-arg "-test") ;; run-id,test-id
       (let* ((dat     (let ((d (map string->number (string-split (args:get-arg "-test") ",")))) ;; RADT couldn't find string->number, though it works