diff --git a/debian/changelog b/debian/changelog
index 23dd452a..b0791a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,12 @@ shadow (1:4.2-2) UNRELEASED; urgency=low
     by the hurd package. Closes: #737805.
     This fix was accidentally forgotten in 1:4.2-1
 
+  [ Josh Triplett ]
+  * use the new pam_exec functionality from pam 1.1.8-1 to implement the
+    dynamic motd, rather than using /run/motd.dynamic from initscripts.
+    This will allow initscripts to drop /etc/init.d/motd.
+    Closes: #741129
+
  -- Christian Perrier <bubulle@debian.org>  Wed, 30 Apr 2014 22:14:23 +0200
 
 shadow (1:4.2-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 951c5f9a..e7ab8f9a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: change and administer password and group data
 
 Package: login
 Architecture: any
-Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime, libpam-modules
+Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime, libpam-modules (>= 1.1.8-1)
 Conflicts: gnunet (<< 0.7.0c-2), amavisd-new (<<2.3.3-8), python-4suite (<< 0.99cvs20060405-1), backupninja (<< 0.9.3-5), echolot (<< 2.1.8-4)
 Breaks: coreutils (<< 8.21~) [hurd-any], passwd (<< 1:4.1.5.1-2~) [hurd-any], hurd (<< 20140206~) [hurd-any]
 Replaces: manpages-de (<< 0.5-3), manpages-tr (<<1.0.5), manpages-zh (<<1.5.1-1), passwd (<< 1:4.1.5.1-2~) [hurd-any], coreutils (<< 8.21~) [hurd-any], hurd (<< 20140206~) [hurd-any]
diff --git a/debian/login.pam b/debian/login.pam
index d5f2c8a3..b165d029 100644
--- a/debian/login.pam
+++ b/debian/login.pam
@@ -82,9 +82,7 @@ session    optional   pam_lastlog.so
 
 # Prints the message of the day upon succesful login.
 # (Replaces the `MOTD_FILE' option in login.defs)
-# 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  noupdate
+session    optional   pam_exec.so type=open_session stdout /bin/uname -snrvm
 session    optional   pam_motd.so
 
 # Prints the status of the user's mailbox upon succesful login