diff --git a/documentation/Makefile b/documentation/Makefile
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -6,6 +6,7 @@
 # Targets intended for use on the command line
 #
 # all (default)	-	generate the books TOC and compile all the documentation
+# clean		- 	removes generated files
 # run		-	serves the built documentation site for local browsing
 # pdf		-	build PDF versions of the articles and books.
 #
@@ -68,6 +69,9 @@
 all: requirements starting-message generate-books-toc generate-pgpkeys-txt build
 run: requirements starting-message generate-books-toc generate-pgpkeys-txt run-local
 
+# clean does not call pdf-clean as that is a subset of hugo-clean
+clean: hugo-clean pgp-clean toc-clean
+
 requirements:
 .for dep in ${RUN_DEPENDS}
 .if !exists(${dep})
@@ -98,6 +102,19 @@
 build: .PHONY
 	${HUGO_CMD} ${HUGO_ARGS}
 
+toc-clean: .PHONY
+	rm -f $$(${PYTHON_CMD} ./tools/books-toc-parts-creator.py    -l ${BOOK_LANGS} -o)
+	rm -f $$(${PYTHON_CMD} ./tools/books-toc-creator.py          -l ${BOOK_LANGS} -o)
+	rm -f $$(${PYTHON_CMD} ./tools/books-toc-figures-creator.py  -l ${BOOK_LANGS} -o)
+	rm -f $$(${PYTHON_CMD} ./tools/books-toc-tables-creator.py   -l ${BOOK_LANGS} -o)
+	rm -f $$(${PYTHON_CMD} ./tools/books-toc-examples-creator.py -l ${BOOK_LANGS} -o)
+
+pgp-clean: .PHONY
+	rm -f static/pgpkeys/pgpkeys.txt
+
+hugo-clean: .PHONY
+	rm -rf resources public
+
 #
 # PDF targets
 # Use DOC_LANG to choose the language, e.g., make DOC_LANG="en fr" pdf-books
@@ -189,10 +206,9 @@
 
 pdf-clean: pdf-articles-clean pdf-books-clean
 
-pdf-books-clean: pdf-books-target
+pdf-books-clean: pdf-books-target toc-clean
 .for _curpdf in ${BOOKSDIR}
-	rm -f ${.CURDIR}/public${_curpdf:S|^${.CURDIR}/content||}book.pdf ${_curpdf}toc*.adoc
-	rm -fr ${.CURDIR}/public${_curpdf:S|^${.CURDIR}/content||}
+	rm -f ${.CURDIR}/public${_curpdf:S|^${.CURDIR}/content||}book.pdf
 .endfor
 .for _lang in ${LANGUAGES:S|,| |g}
 	rm -fr ${.CURDIR}/public/${_lang}/books
@@ -209,7 +225,6 @@
 pdf-articles-clean: pdf-articles-target
 .for _curpdf in ${ARTICLESDIR}
 	rm -f ${.CURDIR}/public${_curpdf:S|^${.CURDIR}/content||}article.pdf
-	rm -fr ${.CURDIR}/public${_curpdf:S|^${.CURDIR}/content||}
 .endfor
 .for _lang in ${LANGUAGES:S|,| |g}
 	rm -fr ${.CURDIR}/public/${_lang}/articles
@@ -222,3 +237,4 @@
 			rm -fr ${.CURDIR}/public; \
 		fi;	\
 	fi
+
diff --git a/website/Makefile b/website/Makefile
--- a/website/Makefile
+++ b/website/Makefile
@@ -41,6 +41,7 @@
 
 all: starting-message generate-releases build post-build end-message
 run: starting-message generate-releases run-local
+clean: hugo-clean releases-clean
 
 starting-message: .PHONY
 	@echo "---------------------------------------------------------------"
@@ -52,7 +53,9 @@
 	@echo "Building the website completed on $$(date)"
 	@echo "---------------------------------------------------------------"
 
-generate-releases: .PHONY
+generate-releases: data/releases.toml
+
+data/releases.toml:
 	${PYTHON_CMD} ./tools/releases-toml.py -p ./shared/releases.adoc
 
 run-local: .PHONY
@@ -66,3 +69,8 @@
 cgi-permissions:
 	@chmod 555 ./public/cgi/*.cgi
 
+hugo-clean:
+	rm -fr public resources
+
+releases-clean:
+	rm -f data/releases.toml