diff --git a/Puppetfile b/Puppetfile
index 34656ae..2b62ee9 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -13,6 +13,7 @@ mod 'puppetlabs-apache', '5.3.0'
 mod 'ghoneycutt-ssh', '3.61.0'
 mod 'puppet-selinux', '3.1.0'
 mod 'puppetlabs-puppetserver_gem', '1.1.1'
+mod 'puppetlabs-motd', '4.0.0'
 
 # Modules from Git
 # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
diff --git a/site-modules/profile/manifests/base.pp b/site-modules/profile/manifests/base.pp
index 3612749..da292a7 100644
--- a/site-modules/profile/manifests/base.pp
+++ b/site-modules/profile/manifests/base.pp
@@ -7,7 +7,11 @@ class profile::base (
   Boolean $resolver = false,
   Boolean $ssh      = true,
   Boolean $selinux  = true,
+  Boolean $motd     = true,
 ) {
+  if $motd {
+    class { '::motd': }
+  }
   if $firewall {
     class { '::profile::base::firewall': }
   }
diff --git a/site-modules/profile/manifests/base/motd.pp b/site-modules/profile/manifests/base/motd.pp
new file mode 100644
index 0000000..ea1fd3f
--- /dev/null
+++ b/site-modules/profile/manifests/base/motd.pp
@@ -0,0 +1,4 @@
+class profile::base::motd (
+) {
+  class { '::motd':
+}