diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cac1da8..38340cf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The **patch** part changes incrementally at each release.
 ## [Unreleased]
 
 ### Added
+* evolinux-base: deploy custom motd if template are present
 
 ### Changed
 
diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml
index fafe0a4e..ff0213a8 100644
--- a/evolinux-base/tasks/main.yml
+++ b/evolinux-base/tasks/main.yml
@@ -96,6 +96,8 @@
   include: log2mail.yml
   when: evolinux_log2mail_include
 
+- include: motd.yml
+
 - name: Munin
   include_role:
     name: munin
diff --git a/evolinux-base/tasks/motd.yml b/evolinux-base/tasks/motd.yml
new file mode 100644
index 00000000..d1171eb4
--- /dev/null
+++ b/evolinux-base/tasks/motd.yml
@@ -0,0 +1,17 @@
+---
+- name: Deploy custom motd
+  template:
+    src: "{{ item }}"
+    dest: /etc/motd
+    force: True
+    owner: root
+    group: root
+    mode: "0644"
+  with_first_found:
+    - files:
+      - "motd/motd.{{ inventory_hostname }}.j2"
+      - "motd/motd.{{ host_group }}.j2"
+      - "motd/motd.default.j2"
+      skip: True
+  tags:
+    - motd