2 files changed, 8 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 1ff63e114..2589a2278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:6.9p1-3) UNRELEASED; urgency=medium
 
   * ssh_config(5): Fix markup errors in description of GSSAPITrustDns
     (closes: #799271).
+  * Fix dh_install and dh_fixperms overrides to work properly with an
+    architecture-independent-only build (closes: #806090).
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 17 Sep 2015 13:52:53 +0100
 
diff --git a/debian/rules b/debian/rules
index 198e2b616..d6b1b101a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -173,7 +173,7 @@ endif
 override_dh_auto_install:
         $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
 
-override_dh_install:
+override_dh_install-arch:
         rm -f debian/tmp/etc/ssh/sshd_config
 
         dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
@@ -186,6 +186,10 @@ override_dh_install:
                 debian/openssh-client/etc/ssh/moduli \
                 debian/openssh-client/etc/ssh/ssh_config
 
+override_dh_install-indep:
+        rm -f debian/tmp/etc/ssh/sshd_config
+        dh_install --fail-missing
+
 override_dh_installdocs:
         dh_installdocs -Nopenssh-server -Nopenssh-sftp-server
         dh_installdocs -popenssh-server -popenssh-sftp-server \
@@ -210,7 +214,7 @@ endif
 override_dh_installpam: debian/openssh-server.sshd.pam
         dh_installpam --name sshd
 
-override_dh_fixperms:
+override_dh_fixperms-arch:
         dh_fixperms
         chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign