diff --git a/Makefile b/Makefile
index c3b8e89..42abd61 100644
--- a/Makefile
+++ b/Makefile
@@ -155,8 +155,10 @@ check-luatex: install-runfiles
 
 $(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
 	@echo "Making $@ for CTAN upload."
-	@$(RM) -- $@
-	@zip -9 $@ $^ >/dev/null
+	@$(RM) -rf -- $@ ./luatexbase
+	@mkdir ./luatexbase
+	@cp $(filter-out $(TDS_ZIP),$^) ./luatexbase/
+	@zip -r9 $@ luatexbase/ $(TDS_ZIP) >/dev/null
 
 $(TDS_ZIP): TEXMFROOT=./tmp-texmf
 $(TDS_ZIP): $(ALL_FILES)
diff --git a/NEWS b/NEWS
index 94d91ef..932b822 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
                     Changes in the luatexbase package/bundle
 
-2013/11/29 v0.7
+2013/12/31 v0.6a
     mcb
         - minor changes and more coherent behaviour
         - refreshing the list of callbacks