2 files changed, 4 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 8ce7bbae4..a98e9d638 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ openssh (1:5.3p1-4) UNRELEASED; urgency=low
     mechanism was removed due to a serious security hole, and since these
     versions of ssh-krb5 are no longer security-supported by Debian I don't
     think there's any point keeping client compatibility for them.
+  * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4.
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 01 Mar 2010 12:24:41 +0000
 
diff --git a/debian/rules b/debian/rules
index 0d47eb002..2101c97ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -257,10 +257,12 @@ binary-openssh-server: build install
         dh_compress
         dh_fixperms
         dh_installdeb
+        # Yes, ETC_PAM_D_SSH is meant to be spelled that way, to match the
+        # old configuration file name we need to transfer.
         perl -i debian/substitute-conffile.pl \
                 ETC_DEFAULT_SSH debian/openssh-server/etc/default/ssh \
                 ETC_INIT_D_SSH debian/openssh-server/etc/init.d/ssh \
-                ETC_PAM_D_SSH debian/openssh-server/etc/pam.d/ssh \
+                ETC_PAM_D_SSH debian/openssh-server/etc/pam.d/sshd \
                 debian/openssh-server/DEBIAN/preinst
         dh_shlibdeps
         dh_gencontrol