diff --git a/doc/man/cdist-environment.text b/doc/man/cdist-environment.text
new file mode 100644
index 00000000..50dfd60b
--- /dev/null
+++ b/doc/man/cdist-environment.text
@@ -0,0 +1,32 @@
+cdist-environment(7)
+====================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-environment - Which environment cdist sets up
+
+
+DESCRIPTION
+-----------
+
+PREFIXES
+--------
+
+These prefixes are supposed to be used. If you write a new type, you
+should stick to these conventions.
+
+- __: All variables setup by cdist are prefixed with a double _
+- __core: Variables setup by the cdist core
+- __<type>_<name>: Variable <name> setup by type <type>
+
+
+EXAPMLES
+--------
+
+
+COPYING
+-------
+Copyright \(C) 2010 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/doc/man/cdist-manifests.text b/doc/man/cdist-manifests.text
new file mode 100644
index 00000000..de26ef5f
--- /dev/null
+++ b/doc/man/cdist-manifests.text
@@ -0,0 +1,33 @@
+cdist-manifests(7)
+==================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-manifests - Map configuration to hosts
+
+
+DESCRIPTION
+-----------
+Using the available types and shell language, you can create mappings of what
+should be configured on a host.
+
+
+
+ENVIRONMENT
+-----------
+The following variables are available in manifests:
+
+- __{explorer|fact}_{name}
+- __core_hostname: Hostname that we are deploying to
+- __core_localhostname: Hostname that we are deploying from
+
+EXAPMLES
+--------
+
+
+COPYING
+-------
+Copyright \(C) 2010 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).