@@ -17,10 +17,11 @@
 
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
 
 (declare (unit common))
+(declare (uses keys))
 
 (include "common_records.scm")
 
 ;; (require-library margs)
 ;; (include "margs.scm")
@@ -952,15 +953,17 @@
       rtestpatt)
      (else args-testpatt))))
      
 (define (common:get-linktree)
   (or (getenv "MT_LINKTREE")
-      (if *configdat*
-	  (configf:lookup *configdat* "setup" "linktree")
+      (or (and *configdat*
+	       (configf:lookup *configdat* "setup" "linktree"))
 	  (if *toppath*
 	      (conc *toppath* "/lt")
-	      #f))))
+	      (if (file-exists? "megatest.config") ;; we are in the toppath (new area, mtutils compatible)
+		  (conc (current-directory) "/lt")
+		  #f)))))
 
 (define (common:args-get-runname)
   (let ((res (or (args:get-arg "-runname")
 		 (args:get-arg ":runname")
 		 (getenv "MT_RUNNAME"))))