diff --git a/.gitignore b/.gitignore
index 099d7de3..ba65e3f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .*.swp
 doc/man/*.[1-9]
 doc/man/.marker
+doc/man/man*/
diff --git a/Makefile b/Makefile
index 23b7962d..7a0b0976 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,12 @@ MANSRC=$(MANDIR)/cdist-config-layout.text \
 	$(MANDIR)/cdist-terms.text 		\
 	$(MANDIR)/cdist-type.text
 
-MANSRC=$(MANDIR)/cdist.text			\
-   $(MANDIR)/cdist-deploy-to.text 	\
-	$(MANDIR)/cdist-manifest.text 	\
+MANSRC=$(MANDIR)/cdist.text				\
+   $(MANDIR)/cdist-bin-transfer.text	\
+   $(MANDIR)/cdist-deploy-to.text 		\
+	$(MANDIR)/cdist-manifest.text 		\
+	$(MANDIR)/cdist-stages.text			\
+	$(MANDIR)/cdist-type-template.text	\
 
 
 ################################################################################
diff --git a/doc/man/cdist-bin-transfer.text b/doc/man/cdist-bin-transfer.text
index 9a9e0a4b..21f00b65 100644
--- a/doc/man/cdist-bin-transfer.text
+++ b/doc/man/cdist-bin-transfer.text
@@ -5,7 +5,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 NAME
 ----
-cdist-bin-transfer
+cdist-bin-transfer - Transfer binaries to the target
 
 
 SYNOPSIS
diff --git a/doc/man/cdist-type-template.text b/doc/man/cdist-type-template.text
new file mode 100644
index 00000000..bbd31409
--- /dev/null
+++ b/doc/man/cdist-type-template.text
@@ -0,0 +1,30 @@
+cdist-type-template(1)
+======================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-type-template - Create a new type
+
+
+SYNOPSIS
+--------
+cdist-type-template NAME
+
+
+DESCRIPTION
+-----------
+cdist-type-template creates a new type and adds the usual files to it.
+It is thought to be helpful when writing new types.
+
+
+SEE ALSO
+--------
+cdist(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).