2 files changed, 4 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index aafb4e26f..03c69975f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ openssh (1:4.1p1-1) UNRELEASED; urgency=low
   * openssh-server Suggests: rssh (closes: #233012).
   * Change libexecdir to /usr/lib/openssh, and fix up various alternatives
     and configuration files to match (closes: #87900, #151321).
+  * Fix up very old sshd_config files that refer to /usr/libexec/sftp-server
+    (closes: #141979).
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 26 May 2005 13:51:50 +0100
 
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index fe6f50775..fa8ce6bdc 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -126,7 +126,8 @@ check_password_auth() {
 
 move_subsystem_sftp() {
         subsystem_sftp="$(get_config_option 'Subsystem sftp')"
-        if [ "$subsystem_sftp" = /usr/lib/sftp-server ]; then
+        if [ "$subsystem_sftp" = /usr/lib/sftp-server ] || \
+           [ "$subsystem_sftp" = /usr/libexec/sftp-server ]; then
                 set_config_option 'Subsystem sftp' /usr/lib/openssh/sftp-server
         fi
 }