--- ssh/Makefile.orig	Wed Apr 26 17:31:58 2000
+++ ssh/Makefile	Sun Jul 30 15:09:14 2000
@@ -2,16 +2,10 @@
 
 PROG=	ssh
 BINOWN=	root
+BINMODE=4555
+BINDIR=	/bin
+MAN1=	ssh.1
 
-.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "hppa")
-BINMODE=0000
-.else
-BINMODE?=4555
-.endif
-
-BINDIR=	/usr/bin
-MAN=	ssh.1
 LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
 MLINKS=	ssh.1 slogin.1
 
@@ -19,10 +13,11 @@
 	sshconnect.c sshconnect1.c sshconnect2.c
 
 .include <bsd.own.mk> # for AFS
+.include "../Makefile.inc"
 
 .if (${KERBEROS} == "yes")
-CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
-LDADD+=	 -lkrb
+CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
+LDADD+=	 -lkrb -lcom_err
 DPADD+=	 ${LIBKRB}
 .if (${AFS} == "yes")
 CFLAGS+= -DAFS
@@ -32,6 +27,7 @@
 .endif # KERBEROS
 
 .include <bsd.prog.mk>
+.include "../Makefile.inc"
 
-LDADD+=	-lutil -lz -lcrypto
+LDADD+=	-lutil -lz ${CRYPTOLIBS}
 DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}