diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index cb142b9ba10c..2eeb6d37c236 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -10,6 +10,9 @@ MLINKS=	ssh.1 slogin.1
 SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
 	sshconnect.c sshconnect1.c sshconnect2.c
 
+DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ}
+LDADD=	-lssh -lutil -lz
+
 .if !defined(NO_KERBEROS)
 CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
 DPADD+=	 ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
@@ -20,8 +23,8 @@ LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
 CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
 .endif
 
-DPADD+=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
-LDADD+=	-lssh -lcrypt -lcrypto -lutil -lz
+DPADD+=	${LIBCRYPT} ${LIBCRYPTO}
+LDADD+=	-lcrypt -lcrypto
 
 .include <bsd.prog.mk>
 
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index ec8fe63a5575..39866c02469f 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -16,6 +16,9 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR}
 
+DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
+LDADD=	-lssh -lutil -lz -lwrap ${MINUSLPAM}
+
 .if !defined(NO_KERBEROS)
 CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
 DPADD+=	 ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
@@ -29,8 +32,8 @@ LDADD+=	-lopie -lmd
 CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
 .endif
 
-DPADD+=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
-LDADD+=	-lssh -lcrypt -lcrypto -lutil -lz -lwrap ${MINUSLPAM}
+DPADD+=	${LIBCRYPT} ${LIBCRYPTO}
+LDADD+=	-lcrypt -lcrypto
 
 .if defined(OPENSSH_USE_POSIX_THREADS) && !defined(NOLIBC_R)
 CFLAGS+=-DUSE_POSIX_THREADS