diff --git a/Makefile b/Makefile
index 34c5f719..6c28a88b 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ MANSRC=$(MANDIR)/cdist.text						\
    $(MANDIR)/cdist-deploy-to.text 				\
 	$(MANDIR)/cdist-explorer.text					\
 	$(MANDIR)/cdist-manifest.text 				\
+	$(MANDIR)/cdist-manifest-run.text			\
    $(MANDIR)/cdist-manifest-run-init.text		\
    $(MANDIR)/cdist-manifest-run-all.text	 	\
 	$(MANDIR)/cdist-object-explorer-all.text	\
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index 0960b372..48a3e125 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -9,3 +9,9 @@ done:
 * Document cdist-explorer-run-global
 * Document cdist-manifest-run-init
 * Document cdist-manifest-run-all
+cdist-run-remote
+cdist-code-run-all
+cdist-object-gencode
+
+cdist-object-gencode-all
+cdist-manifest-run
diff --git a/doc/man/cdist-manifest-run.text b/doc/man/cdist-manifest-run.text
new file mode 100644
index 00000000..d483b29b
--- /dev/null
+++ b/doc/man/cdist-manifest-run.text
@@ -0,0 +1,33 @@
+cdist-manifest-run(1)
+=====================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-manifest-run - Run a given manifest
+
+
+SYNOPSIS
+--------
+cdist-manifest-run HOSTNAME MANIFEST OUTPUT_DIR
+
+
+DESCRIPTION
+-----------
+cdist-manifest-run executes the given MANIFEST and saves the output into
+OUTPUT_DIR.
+
+
+SEE ALSO
+--------
+- cdist(7)
+- cdist-deploy-to(1)
+- cdist-manifest-run-all(1)
+- cdist-manifest-run-init(1)
+
+
+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).