--- a/testsuite/Makefile	Mon Nov 17 15:01:21 2008 +0000
+++ b/testsuite/Makefile	Mon Nov 17 15:10:30 2008 +0000
@@ -1,5 +1,27 @@
+TEST_SUBDIRS=Content Timing Styling Specification
+DATE=$(shell date "+%Y%m%d")
 
-main: filelist
+main: filelist archive
 
 filelist:
-	generate_filelist.xml.sh
+	echo "<files>" > filelist.xml
+	for DIR in $(TEST_SUBDIRS) ; do \
+          for file in $$DIR/*[0-9][0-9][0-9].xml ; do \
+	    echo "<file>$$file</file>" >>filelist.xml ; \
+	  done \
+	done
+	echo "</files>" >>filelist.xml
+
+archive: filelist
+	rm -f testsuite.zip
+	zip testsuite.zip filelist.xml LICENSE
+	for DIR in $(TEST_SUBDIRS) ; do \
+          for file in $$DIR/*[0-9][0-9][0-9].xml ; do \
+	    zip testsuite.zip "$$file" ; \
+	  done \
+	done
+
+release: archive
+	cp testsuite.zip testsuite-$(DATE).zip
+
+