diff --git a/system/base.sls b/system/base.sls
index ec5a92e..1ceaf93 100644
--- a/system/base.sls
+++ b/system/base.sls
@@ -45,6 +45,7 @@ system_base_motd:
     - context:
         OS_NAME: {{ salt['cmd.shell']('grep -E ^PRETTY_NAME /etc/os-release | cut -d= -f2') }}
         OS_VERSION: {{ salt['cmd.shell']('grep -E ^VERSION_ID /etc/os-release | cut -d= -f2') }}
+        OS_ISSUE_URL: {{ salt['cmd.shell']('grep -E ^BUG_REPORT_URL /etc/os-release | cut -d= -f2') }}
     - user: root
     - group: root
     - mode: '0644'
\ No newline at end of file
diff --git a/system/files/base_motd.jinja b/system/files/base_motd.jinja
index 89606aa..7defe58 100644
--- a/system/files/base_motd.jinja
+++ b/system/files/base_motd.jinja
@@ -11,3 +11,7 @@
 
 OS: {{ OS_NAME }}
 Version: {{ OS_VERSION }}
+
+Report issues on: {{ OS_ISSUE_URL }}
+
+═════════════════════════════════════════════════