diff --git a/linux/system/motd.sls b/linux/system/motd.sls
index a7ef8f2..ea8d9ad 100644
--- a/linux/system/motd.sls
+++ b/linux/system/motd.sls
@@ -22,6 +22,14 @@
   file.directory:
     - clean: true
 
+{%- if grains.oscodename == "jessie" %}
+motd_fix_pam_sshd:
+  file.replace:
+    - name: /etc/pam.d/sshd
+    - pattern: "/run/motd.dynamic"
+    - repl: "/run/motd"
+{%- endif %}
+
 {%- for motd in system.motd %}
 {%- set motd_index = loop.index %}