2 files changed, 11 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 0b0189f27..17d3eb615 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssh (1:5.9p1-6) UNRELEASED; urgency=low
+
+  [ Roger Leigh ]
+  * Display dynamic part of MOTD from /run/motd.dynamic, if it exists
+    (closes: #669699).
+
+ -- Colin Watson <cjwatson@debian.org>  Sat, 21 Apr 2012 10:57:23 +0100
+
 openssh (1:5.9p1-5) unstable; urgency=low
 
   * Use dpkg-buildflags, including for hardening support; drop use of
diff --git a/debian/openssh-server.sshd.pam b/debian/openssh-server.sshd.pam
index 9b7695184..7c0d5417d 100644
--- a/debian/openssh-server.sshd.pam
+++ b/debian/openssh-server.sshd.pam
@@ -24,6 +24,9 @@ account    required     pam_nologin.so
 @include common-session
 
 # Print the message of the day upon successful login.
+# This includes a dynamically generated part from /run/motd.dynamic
+# and a static (admin-editable) part from /etc/motd.
+session    optional     pam_motd.so  motd=/run/motd.dynamic
 session    optional     pam_motd.so # [1]
 
 # Print the status of the user's mailbox upon successful login.