Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -11,11 +11,11 @@
 
 ;;======================================================================
 ;; Config file handling
 ;;======================================================================
 
-(use regex regex-case)
+(use regex regex-case directory-utils)
 (declare (unit configf))
 (declare (uses common))
 (declare (uses process))
 
 (include "common_records.scm")
@@ -148,16 +148,21 @@
 		res)
 	      (regex-case 
 	       inl 
 	       (configf:comment-rx _                  (loop (configf:read-line inp res allow-system) curr-section-name #f #f))
 	       (configf:blank-l-rx _                  (loop (configf:read-line inp res allow-system) curr-section-name #f #f))
-	       (configf:include-rx ( x include-file ) (let ((curr-dir (current-directory))
-							    (conf-dir  (pathname-directory path)))
-							(if conf-dir (change-directory conf-dir))
-							(read-config include-file res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections)
-							(change-directory curr-dir)
-							(loop (configf:read-line inp res allow-system) curr-section-name #f #f)))
+	       (configf:include-rx ( x include-file ) (if (file-exists? include-file)
+							  (let ((curr-dir (current-directory))
+								(conf-dir (pathname-directory include-file))
+								(incfname (pathname-strip-directory include-file))) 
+							    (push-directory conf-dir)
+							    (read-config incfname res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections)
+							    (pop-directory)
+							    (loop (configf:read-line inp res allow-system) curr-section-name #f #f))
+							  (begin
+							    (debug:print 0 "INFO: include file " include-file " not found (called from " path ")")
+							    (loop (configf:read-line inp res allow-system) curr-section-name #f #f))))
 	       (configf:section-rx ( x section-name ) (loop (configf:read-line inp res allow-system)
 							    ;; if we have the sections list then force all settings into "" and delete it later?
 							    (if (or (not sections) 
 								    (member section-name sections))
 								section-name "") ;; stick everything into ""

Index: docs/megatest-training.odp
==================================================================
--- docs/megatest-training.odp
+++ docs/megatest-training.odp
cannot compute difference between binary files

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -40,11 +40,11 @@
 ;;        cdb:client-call
 ;;        tests:check-waiver-eligibility)
        
 
 (define help (conc "
-Megatest, documentation at http://chiselapp.com/user/kiatoa/repository/megatest
+Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright Matt Welland 2006-2012
 
 Usage: megatest [options]
   -h                      : this help

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -6,11 +6,11 @@
 # refareas can be searched to find previous runs
 # the path points to where megatest.db exists
 [refareas]
 area1 /tmp/oldarea/megatest
 
-[include #{getenv MT_RUN_AREA_HOME}/config/mt_include_1.config]
+[include config/mt_include_1.config]
 
 [setup]
 
 # It is possible (but not recommended) to override the rsync command used
 # to populate the test directories. For test development the following