4 files changed, 9 insertions, 7 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index aabaebfe1..6b7ce8691 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -219,12 +219,13 @@ ssh is compiled with support for tcp-wrappers. So if you can no longer
 log into your system, please check that /etc/hosts.allow and /etc/hosts.deny
 are configured so that ssh is not blocked. 
 
-Kerberos Authentication
------------------------
+Kerberos support
+----------------
 
-ssh is compiled without support for kerberos authentication, and there are
-no current plans to support this.  Thus the KerberosAuthentication and 
-KerberosTgtPassing options will not be recognised.
+ssh is now compiled with Kerberos support. Unfortunately, privilege
+separation is incompatible with Kerberos support for SSH protocol 1 and
+parts of the support for protocol 2; you may need to run kinit after logging
+in.
 
 Interoperability between scp and the ssh.com SSH server
 -------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 5693ef352..5da5c8477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openssh (1:4.2p1-2) UNRELEASED; urgency=low
     - Add GSSAPI key exchange support from
       http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen
       Frost).
+    - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr.
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 14 Sep 2005 15:48:57 +0100
 
diff --git a/debian/control b/debian/control
index 3ba6b4606..9785b9f5d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
 Section: net
 Priority: standard
 Maintainer: Matthew Vernon <matthew@debian.org>
-Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 3), sharutils, libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sparc]
+Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 3), sharutils, libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sparc], libkrb5-dev
 Standards-Version: 3.6.2
 Uploaders: Colin Watson <cjwatson@debian.org>
 
diff --git a/debian/rules b/debian/rules
index 63087d072..74c39731e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ build-deb: build-deb-stamp
 build-deb-stamp:
         dh_testdir
         mkdir -p build-deb
-        cd build-deb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit $(SELINUX)
+        cd build-deb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit --with-kerberos5=/usr $(SELINUX)
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
         # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999).