diff --git a/CHANGELOG b/CHANGELOG
index ae07be1eeb..27fc938f27 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -71,8 +71,6 @@ v3.2.alpha1 (2017-02-05)
 
 * more detailed stacktraces in Foxx apps
 
-* add support for Swagger tags in Foxx
-
 
 v3.1.12 (XXXX-XX-XX)
 --------------------
@@ -233,6 +231,8 @@ shards.
 
 * process.stdout.isTTY now returns `true` in arangosh and when running arangod with the `--console` flag
 
+* add support for Swagger tags in Foxx
+
 
 v3.1.9 (XXXX-XX-XX)
 -------------------
diff --git a/Documentation/Books/Makefile b/Documentation/Books/Makefile
index afd995231b..1cdf180f67 100644
--- a/Documentation/Books/Makefile
+++ b/Documentation/Books/Makefile
@@ -427,8 +427,15 @@ build-dist-books:
 		DISPL="$${DISPLAY}"; \
 	fi; \
 	make build-books DISPLAY="$${DISP}"; \
-	mkdir -p ${OUTPUT_DIR}; \
-	( cd books; tar -czf ${OUTPUT_DIR}/ArangoDB-${newVersionNumber}.tar.gz ${ALLBOOKS} index.html; ); \
+	mkdir -p ${OUTPUT_DIR} ; \
+	( \
+		mv books ArangoDB-${newVersionNumber} ; \
+		if test -n "${COOKBOOK_DIR}" ; then \
+			cp -a ${COOKBOOK_DIR} ArangoDB-${newVersionNumber}/cookbook ; \
+		fi ; \
+		tar -czf ${OUTPUT_DIR}/ArangoDB-${newVersionNumber}.tar.gz ArangoDB-${newVersionNumber} ; \
+		mv ArangoDB-${newVersionNumber} books ; \
+	) ; \
 	for book in $(ALLBOOKS); do \
 		make build-book-dist NAME=$${book} DISPLAY="$${DISP}" ; \
 	done; \