diff --git a/motd/files/empty b/motd/files/empty
new file mode 100644
index 0000000..e69de29
diff --git a/motd/manifests/init.pp b/motd/manifests/init.pp
new file mode 100644
index 0000000..3df5908
--- /dev/null
+++ b/motd/manifests/init.pp
@@ -0,0 +1,29 @@
+
+# Deploy motd file to server
+#
+class motd {
+
+    case $::operatingsystem {
+        "ubuntu": {
+            package { "update-motd":
+                ensure => absent,
+            }
+        }
+    }
+
+    file { "/etc/motd":
+        ensure => present,
+        source => [
+          "puppet:///files/motd/motd.${::homename}",
+          "puppet:///files/motd/motd",
+          "puppet:///modules/motd/empty",
+        ],
+        mode   => "0644",
+        owner  => "root",
+        group  => $::operatingsystem ? {
+            "openbsd" => "wheel",
+            default   => "root",
+        },
+    }
+
+}