Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -343,11 +343,14 @@
 	      (archive-block-id        (db:test-get-archived test-dat))
 	      (archive-block-info      (rmt:test-get-archive-block-info archive-block-id))
 	      (archive-path            (if (vector? archive-block-info)
 					   (vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info
 					   #f)) ;; no archive found?
-	      (archive-internal-path   (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path)))
+	      (archive-internal-path   (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path))
+	      (include-paths           (args:get-arg "-include"))
+	      (exclude-pattern         (args:get-arg "-exclude-rx"))
+	      (exclude-file            (args:get-arg "-exclude-rx-from")))
 	 
 	 ;; some sanity checks, move an existing path out of the way - iif it is not a toplevel with children
 	 ;;
 	 (if (and (not toplevel/children)  ;; special handling needed for toplevel with children
 		  prev-test-physical-path
@@ -440,18 +443,25 @@
 		   (archive-block-info      (rmt:test-get-archive-block-info archive-block-id))
 		   (archive-path            (if (vector? archive-block-info)
 						(vector-ref archive-block-info 2)
 						#f))
 		   (archive-internal-path   (conc (common:get-testsuite-name) "-" run-id
-						  "/latest/" test-partial-path)))
+						  "/latest/" test-partial-path))
+		   (include-paths           (args:get-arg "-include"))
+		   (exclude-pattern         (args:get-arg "-exclude-rx"))
+		   (exclude-file            (args:get-arg "-exclude-rx-from")))
 	      
 	      (if (and archive-path ;; no point in proceeding if there is no actual archive
 		       (not toplevel/children))
 		  (begin
-		    (let* ((bup-restore-params  (list "-d" archive-path "restore" "-C" (or destpath "data")
-						      ;; " " ;; What is the empty string for?
-						      archive-internal-path)))
+		    (let* ((bup-restore-params (append (list "-d" archive-path "restore" "-C" (or destpath "data"))
+						       ;; " " ;; What is the empty string for?
+						       (if include-paths
+							   (map (lambda (p)
+								  (conc archive-internal-path "/" p))
+								(string-split include-paths ","))
+							   (list archive-internal-path)))))
 		      (debug:print-info 0 *default-log-port* "Restoring archived data to " (or destpath "data")
 					" from archive in " archive-path " ... " archive-internal-path)
 		      (run-n-wait bup-exe params: bup-restore-params print-cmd: #t)))
 		  (let ((new-rem-tests (filter (lambda (tdat)
 						 (or (not (eq? (db:test-get-id tdat) test-id))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -345,13 +345,18 @@
 
                         ;; move runs stuff here
                         "-remove-keep"           
 			"-set-run-status"
 			"-age"
+
+			;; archive 
 			"-archive"
 			"-actions"
 			"-precmd"
+			"-include"
+			"-exclude-rx"
+			"-exclude-rx-from"
 			
 			"-debug" ;; for *verbosity* > 2
 			"-create-test"
 			"-override-timeout"
 			"-test-files"  ;; -test-paths is for listing all