diff --git a/Makefile b/Makefile
index 330accc1a175dfa2a7fa4558a9b85bf7c158eea4..21709af01b3d2496dfc7e7b0b8ed4d420a619c43 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,27 @@
+
 # Core language conformance tests deliverables
-CORE_LANGUAGE_ICS_TGT = ts_10295001v011001p.zip
-CORE_LANGUAGE_TSS_TGT = ts_10295002v011001p.zip
-CORE_LANGUAGE_ATS_TGT = ts_10295003v011001p.zip
+CORE_LANGUAGE_ICS_ARCHIVE = ts_10295001v011001p.zip
+CORE_LANGUAGE_TSS_ARCHIVE = ts_10295002v011001p.zip
+CORE_LANGUAGE_ATS_ARCHIVE = ts_10295003v011001p.zip
 
 # XML and JSON conformance tests deliverables
-XML_JSON_ATS = ts_103255v010701p.zip
+XML_JSON_ATS_ARCHIVE = ts_103255v010701p.zip
 
 # Object oriented features conformance tests deliverables
-OO_ICS_TGT = ts_10366301v010301p.zip
-OO_TSS_TGT = ts_10366302v010301p.zip
-OO_ATS_TGT = ts_10366303v010301p.zip
+OO_ICS_ARCHIVE = ts_10366301v010301p.zip
+OO_TSS_ARCHIVE = ts_10366302v010301p.zip
+OO_ATS_ARCHIVE = ts_10366303v010301p.zip
 
-DELIVERABLES = $(CORE_LANGUAGE_ICS_TGT) $(CORE_LANGUAGE_TSS_TGT) $(CORE_LANGUAGE_ATS_TGT) $(XML_JSON_ATS) $(OO_ICS_TGT) $(OO_TSS_TGT) $(OO_ATS_TGT)
+DELIVERABLES = $(CORE_LANGUAGE_ICS_ARCHIVE) $(CORE_LANGUAGE_TSS_ARCHIVE) $(CORE_LANGUAGE_ATS_ARCHIVE) $(XML_JSON_ATS_ARCHIVE) $(OO_ICS_ARCHIVE) $(OO_TSS_ARCHIVE) $(OO_ATS_ARCHIVE)
 
+VPATH=docs
 .PHONY: all ## Build all deliverables
 all: $(DELIVERABLES)
 
+$(CORE_LANGUAGE_ATS_ARCHIVE): $(shell find ATS/core_language -type f)
+$(XML_JSON_ATS_ARCHIVE): $(shell find ATS/json ATS/xml -type f)
+$(OO_ATS_ARCHIVE): $(shell find ATS/oo -type f)
+
 .PHONY: clean ## Remove all artifacts.
 clean:
 	@rm -fv $(DELIVERABLES) $(DELIVERABLES:.zip=.pdf)
@@ -34,4 +40,4 @@ help:
 
 # Every deliverable requires a PDF file
 %.zip: %.pdf
-	zip $@ $^
+	zip -r9 $@ $^