diff --git a/conf/type/__motd/README b/conf/type/__motd/README
new file mode 100644
index 00000000..f7bbde5c
--- /dev/null
+++ b/conf/type/__motd/README
@@ -0,0 +1 @@
+Manage /etc/issue
diff --git a/conf/type/__motd/files/motd b/conf/type/__motd/files/motd
new file mode 100644
index 00000000..b5f5bfdf
--- /dev/null
+++ b/conf/type/__motd/files/motd
@@ -0,0 +1,17 @@
+
+Welcome to a cdist automated systems!
+
+             ..          .       .x+=:.        s    
+           dF           @88>    z`    ^%      :8    
+          '88bu.        %8P        .   <k    .88    
+      .   '*88888bu      .       .@8Ned8"   :888ooo 
+ .udR88N    ^"*8888N   .@88u   .@^%8888"  -*8888888 
+<888'888k  beWE "888L ''888E` x88:  `)8b.   8888    
+9888 'Y"   888E  888E   888E  8888N=*8888   8888    
+9888       888E  888E   888E   %8"    R88   8888    
+9888       888E  888F   888E    @8Wou 9%   .8888Lu= 
+?8888u../ .888N..888    888&  .888888P`    ^%888*   
+ "8888P'   `"888*""     R888" `   ^"F        'Y"    
+   "P'        ""         ""                         
+
+
diff --git a/conf/type/__motd/man.text b/conf/type/__motd/man.text
new file mode 100644
index 00000000..1fca60d3
--- /dev/null
+++ b/conf/type/__motd/man.text
@@ -0,0 +1,48 @@
+cdist-type__motd(7)
+===================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-type__motd - Manage message of the day
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to easily setup /etc/motd.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+source::
+   If supplied, copy this file from the host running cdist to the target.
+   If not supplied, a default message will be placed onto the target.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Use cdist defaults
+__motd
+
+# Supply source file from a different type
+__file --source "$__type/files/my-motd"
+--------------------------------------------------------------------------------
+
+
+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/manifest b/conf/type/__motd/manifest
new file mode 100755
index 00000000..594977b9
--- /dev/null
+++ b/conf/type/__motd/manifest
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+destination=/etc/motd
+
+# Select motd source
+if [ -f "$__object/parameter/source" ]; then
+   source="$(cat "$__object/parameter/source")"
+else
+   source="$__type/files/motd"
+fi
+
+__file "$destination" --source "$source" --type file
diff --git a/conf/type/__motd/singleton b/conf/type/__motd/singleton
new file mode 100644
index 00000000..e69de29b