--- sshd/Makefile.orig	Wed Apr 26 17:31:57 2000
+++ sshd/Makefile	Sun Jul 30 15:09:25 2000
@@ -3,14 +3,15 @@
 PROG=	sshd
 BINOWN=	root
 BINMODE=555
-BINDIR=	/usr/sbin
-MAN=	sshd.8
+BINDIR=	/sbin
+MAN8=	sshd.8
 
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	pty.c log-server.c login.c servconf.c serverloop.c \
 	auth.c auth1.c auth2.c session.c
 
 .include <bsd.own.mk> # for KERBEROS and AFS
+.include "../Makefile.inc"
 
 .if (${KERBEROS} == "yes")
 .if (${AFS} == "yes")
@@ -18,9 +19,9 @@
 LDADD+=  -lkafs
 DPADD+=  ${LIBKRBAFS}
 .endif # AFS
-CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
+CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
 SRCS+=	auth-krb4.c
-LDADD+=	 -lkrb
+LDADD+=	 -lkrb -lcom_err
 DPADD+=	 ${LIBKRB}
 .endif # KERBEROS
 
@@ -30,7 +31,7 @@
 
 .include <bsd.prog.mk>
 
-LDADD+=	-lcrypto -lutil -lz
+LDADD+=	${CRYPTOLIBS} -lcrypt -lutil -lz
 DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
 
 .if (${TCP_WRAPPERS} == "yes")