diff --git a/conf/type/__issue/README b/conf/type/__issue/README
deleted file mode 100644
index f7bbde5c..00000000
--- a/conf/type/__issue/README
+++ /dev/null
@@ -1 +0,0 @@
-Manage /etc/issue
diff --git a/conf/type/__issue/man.text b/conf/type/__issue/man.text
new file mode 100644
index 00000000..57ece530
--- /dev/null
+++ b/conf/type/__issue/man.text
@@ -0,0 +1,41 @@
+cdist-type__issue(7)
+===================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-type__issue - Manage issue
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to easily setup /etc/issue.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+None
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__issue
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(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).
diff --git a/conf/type/__motd/README b/conf/type/__motd/README
deleted file mode 100644
index f7bbde5c..00000000
--- a/conf/type/__motd/README
+++ /dev/null
@@ -1 +0,0 @@
-Manage /etc/issue
diff --git a/doc/changelog b/doc/changelog
index aa466277..c939b547 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,5 +1,7 @@
 1.0.4:
-	* New type: __motd
+	* New type __motd
+	* New type __addifnosuchline
+	* Document type __issue
 
 1.0.3: 2011-03-11
 	* Update regexp used for sane characters