2 files changed, 3 insertions, 0 deletions

diff --git a/Makefile.in b/Makefile.in
index 1e79ab913..852fb70e4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -276,6 +276,7 @@ install-files: scard-install
         $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
         $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
         $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
+        ln -s ../$(mansubdir)8/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)5/authorized_keys.5
         if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \
                 $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \
         fi
diff --git a/debian/changelog b/debian/changelog
index 189d0b23d..b75c994d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ openssh (1:4.6p1-6) UNRELEASED; urgency=low
   * Remove blank line between head comment and first template in
     debian/openssh-server.templates.master; apparently it confuses some
     versions of debconf.
+  * Install authorized_keys(5) as a symlink to sshd(8) (thanks, Tomas
+    Pospisek; closes: #441817).
   * debconf template translations:
     - Add Slovak (thanks, Ivan Masár; closes: #441690).