2 files changed, 10 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index e069c305e..1a86a8dcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:4.7p1-5) UNRELEASED; urgency=low
+
+  * Recommends: xauth rather than Suggests: xbase-clients.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 27 Feb 2008 08:10:19 +0000
+
 openssh (1:4.7p1-4) unstable; urgency=low
 
   [ Caleb Case ]
diff --git a/debian/control b/debian/control
index e72b0e914..290799998 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,10 @@ Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.or
 Package: openssh-client
 Architecture: any
 Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, adduser (>= 3.10), dpkg (>= 1.7.0), passwd
+Recommends: xauth
 Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
 Replaces: ssh, ssh-krb5
-Suggests: ssh-askpass, xbase-clients, libpam-ssh, keychain
+Suggests: ssh-askpass, libpam-ssh, keychain
 Provides: rsh-client, ssh-client
 Description: secure shell client, an rlogin/rsh/rcp replacement
  This is the portable version of OpenSSH, a free implementation of
@@ -37,9 +38,10 @@ Package: openssh-server
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.0-6)
+Recommends: xauth
 Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
 Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
-Suggests: ssh-askpass, xbase-clients, rssh, molly-guard
+Suggests: ssh-askpass, rssh, molly-guard
 Provides: ssh-server
 Description: secure shell server, an rshd replacement
  This is the portable version of OpenSSH, a free implementation of