diff --git a/Makefile b/Makefile
index ebe51e9..75355fb 100644
--- a/Makefile
+++ b/Makefile
@@ -13,3 +13,21 @@ $(dirs):
 
 $(install-dirs): install-%:
 	$(MAKE) -C $*/ install
+
+dvi:
+	$(MAKE) -C doc/ dvi
+
+pdf:
+	$(MAKE) -C doc/ pdf
+
+ps:
+	$(MAKE) -C doc/ ps
+
+install-dvi:
+	$(MAKE) -C doc/ install-dvi
+
+install-pdf:
+	$(MAKE) -C doc/ install-pdf
+
+install-ps:
+	$(MAKE) -C doc/ install-ps
diff --git a/doc/.gitignore b/doc/.gitignore
index bf12a97..aab0fe6 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,13 @@
 *.info
+*.aux
+*.cp
+*.dvi
+*.fn
+*.ky
+*.log
+*.pdf
+*.pg
+*.ps
+*.toc
+*.tp
+*.vr
diff --git a/doc/Makefile b/doc/Makefile
index 7e798bf..edb2998 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,6 +1,6 @@
 DESTDIR ?= /usr/local
 
-.PHONY: all
+.PHONY: all html dvi pdf ps
 
 all: markam.info
 
@@ -9,4 +9,32 @@ install: markam.info
 	install-info --dir-file="$(DESTDIR)/share/info/dir" \
 		"$(DESTDIR)/share/info/markam.info"
 
+install-dvi: markam.dvi
+	install -Dm 655 markam.dvi \
+		"$(DESTDIR)/share/doc/markam/dvi/markam.dvi"
+
+install-pdf: markam.pdf
+	install -Dm 655 markam.pdf \
+		"$(DESTDIR)/share/doc/markam/pdf/markam.pdf"
+
+install-ps: markam.ps
+	install -Dm 655 markam.ps \
+		"$(DESTDIR)/share/doc/markam/ps/markam.ps"
+
 markam.info: markam.texi
+
+html: markam.texi
+	makeinfo --html markam.texi -o html
+
+dvi: markam.dvi
+pdf: markam.pdf
+ps: markam.ps
+
+markam.dvi: markam.texi
+	texi2dvi markam.texi
+
+markam.pdf: markam.texi
+	texi2pdf markam.texi
+
+markam.ps: markam.dvi
+	dvips markam.dvi
diff --git a/doc/markam.texi b/doc/markam.texi
index 1f22b48..08cb088 100644
--- a/doc/markam.texi
+++ b/doc/markam.texi
@@ -29,7 +29,7 @@ The document was typeset with
 @titlepage
 @title markam User Manual
 @subtitle The user manual for markam
-@author Tom Willemsen <tom@ryuslash.org>
+@author Tom Willemsen
 @page
 @vskip 0pt plus 1filll
 @insertcopying