diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 28aa3786..61e4277c 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -219,3 +219,6 @@ evolinux_generateldif_include: True
 
 # Cron check_hpraid
 evolinux_cron_checkhpraid_frequency: daily
+
+# Motd
+evolinux_motd_include: True
\ No newline at end of file
diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml
index 49e816ee..dbd50950 100644
--- a/evolinux-base/tasks/main.yml
+++ b/evolinux-base/tasks/main.yml
@@ -97,6 +97,7 @@
   when: evolinux_log2mail_include | bool
 
 - include: motd.yml
+  when: evolinux_motd_include | bool
 
 - include: utils.yml