diff --git a/.gitignore b/.gitignore
index 8c5cd18..e556f2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 conf/sources/*/destination/*
 doc/old
 doc/*.html
+doc/*.docbook
+doc/*.texi
diff --git a/Makefile b/Makefile
index 02ef1f2..2ea3687 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,11 @@ host=creme.schottelius.org
 dir=www/org/schottelius/linux/ccollect
 docdir=$(dir)/doc
 
+#
+# Asciidoc will be used to generate other formats later
+#
+DOCS     = doc/ccollect.text doc/ccollect-DE.text
+
 #
 # End user targets
 #
@@ -35,10 +40,6 @@ install-link: install-script
 install-script:
 	$(INSTALL) -D -m 0755 -s $(CCOLLECT) $(destination)
 
-documentation: doc/ccollect.html doc/ccollect-DE.html
-	@echo "Generated documentation"
-#	@asciidoc -n -o doc/ccollect.html  doc/ccollect.text
-#	@asciidoc -n -o doc/ccollect-DE.html  doc/ccollect-DE.text
 
 %.html: %.text
 	${ASCIIDOC} -n -o $@ $<
@@ -63,3 +64,30 @@ publish-doc: documentation
 	@echo "Transferring files to $(host)"
 	@chmod a+r doc/*.html doc/*.text
 	@scp doc/*.text doc/*.html $(host):$(docdir)
+
+#
+# Doku
+#
+HTMLDOCS = $(DOCS:.text=.html)
+
+TEXIDOCS = $(DOCS:.text=.texi)
+
+DOCBDOCS = $(DOCS:.text=.docbook)
+
+html: ${HTMLDOCS}
+
+info: ${TEXIDOCS}
+
+documentation: html info
+
+#
+# Distribution
+#
+allclean:
+	#rm -f doc/*.docbook doc/*.html doc/*.texi
+	rm -f $(TEXIDOCS) $(HTMLDOCS)
+
+distclean:
+	rm -f $(DOCBDOCS)
+
+dist: distclean documentation