diff --git a/.github/workflows/make-dist.yml b/.github/workflows/make-dist.yml
index 6ccb144..f55d2dd 100644
--- a/.github/workflows/make-dist.yml
+++ b/.github/workflows/make-dist.yml
@@ -19,7 +19,7 @@ jobs:
         run: |
           apk add make git zip
           git config --global --add safe.directory '*'
-          make dist
+          make dist CTAN
     
     - name: Release
       uses: softprops/action-gh-release@v1
@@ -43,7 +43,7 @@ jobs:
       uses: paolobrasolin/ctan-submit-action@v1
       with: 
         action: upload
-        file_path: dist/photobook*.zip
+        file_path: dist/CTAN/photobook.zip
         fields: |
             pkg: photobook
             version: 0.0.1
diff --git a/Makefile b/Makefile
index 5aa5281..b83ecf9 100644
--- a/Makefile
+++ b/Makefile
@@ -268,10 +268,22 @@ manual:
 	mv manual/*.pdf .
 
 
+%.zipnote: %.zip
+	zipnote $< > $@
+
+
 .PHONY: dist
 dist: $(DIST_FILES)
 	$(MD) $(DIST_DIR)
 	zip -Drq $(DIST_DIR)/$(DIST_NAME).zip $(DIST_FILES)
+	# Place everything in the module dir as per CTAN spec...
+	zipnote $(DIST_DIR)/$(DIST_NAME).zip \
+		| sed 's/^\@ \([^(].*\)$$/@ \1\n@=$(MODULE)\/\1/' \
+		| zipnote -w $(DIST_DIR)/$(DIST_NAME).zip
+
+CTAN: dist
+	$(MD) $(DIST_DIR)/CTAN
+	cp $(DIST_DIR)/$(DIST_NAME).zip $(DIST_DIR)/CTAN/$(MODULE).zip
 
 
 .PHONY: all