diff --git a/system/base.sls b/system/base.sls
index 2aadeff..528a941 100644
--- a/system/base.sls
+++ b/system/base.sls
@@ -36,3 +36,17 @@ system_base_os-release:
     - user: root
     - group: root
     - mode: '0644'
+
+system_base_motd:
+  file.managed:
+    - name: /etc/motd
+    - source: salt://{{ tpldir }}/files/base_motd.jinja
+    - template: jinja
+    - context:
+        OS_NAME: {{ salt['cmd.shell']('grep -E ^NAME /etc/os-release | cut -d= -f2 | sed \'s~"~~g\'') }}
+        OS_VERSION: {{ salt['cmd.shell']('grep -E ^VERSION_ID /etc/os-release | cut -d= -f2 | sed \'s~"~~g\'') }}
+    - user: root
+    - group: root
+    - mode: '0644'
+    - require:
+      - system_base_os-release
\ No newline at end of file