diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index eb5236ede827..27954cb02a0c 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -6,8 +6,10 @@ SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
 	cipher.c compat.c compress.c crc32.c deattack.c \
 	hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
 	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
-	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c \
-	cli.c rijndael.c version.c
+	key.c dispatch.c kex.c mac.c uuencode.c misc.c \
+	cli.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
+	version.c
+
 
 NOPIC=		yes
 INTERNALLIB=	yes
@@ -27,11 +29,6 @@ CFLAGS+= -DKRB4
 CFLAGS+= -DKRB5
 .endif # MAKE_KERBEROS5
 
-CFLAGS+= -DSKEY
-DPADD+=	${LIBOPIE}
-LDADD+= -lopie
-SRCS+=	auth-skey.c auth2-skey.c
-
 .include <bsd.lib.mk>
 
 .PATH:	${SSHDIR} ${SSHDIR}/lib
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index a913d5d3a811..f1cc1b11cca3 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -2,7 +2,7 @@
 #
 
 PROG=   sftp-server
-SRCS=   sftp-server.c log-server.c
+SRCS=   sftp-server.c sftp-common.c
 MAN=	sftp-server.8
 
 LDADD+=	${LIBSSH} -lcrypto
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index fd67fd8482a2..42b8aa2ff2b3 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -7,7 +7,7 @@ SUBDIR+=telnet
 .if !defined(NO_OPENSSL)
 SUBDIR+=openssl
 .if !defined(NO_OPENSSH)
-SUBDIR+=scp ssh ssh-add ssh-agent ssh-keygen
+SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
 .endif
 .endif
 
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index c4cfac2bbf5d..7a27bf4eceba 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -2,6 +2,7 @@
 #
 
 PROG=	scp
+SRCS=	scp.c scp-common.c
 
 LDADD+=	${LIBSSH} -lcrypto -lutil -lz
 DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
new file mode 100644
index 000000000000..db988ab06746
--- /dev/null
+++ b/secure/usr.bin/sftp/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+#
+
+PROG=	sftp
+SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c scp-common.c
+
+LDADD+=	${LIBSSH} -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
+
+.include <bsd.prog.mk>
+
+.PATH:	${SSHDIR}
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index fb657dabd327..10627d8e811e 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -2,10 +2,10 @@
 #
 
 PROG=	ssh-add
-SRCS=	ssh-add.c log-client.c
+SRCS=	ssh-add.c
 
-LDADD+=	${LIBSSH} -lcrypto -lcrypt -lutil -lz
-DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+LDADD+=	${LIBSSH} -lcrypto
+DPADD+= ${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index bf9cfd612e6c..f00acd0560f0 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -2,10 +2,10 @@
 #
 
 PROG=	ssh-agent
-SRCS=	ssh-agent.c log-client.c
+SRCS=	ssh-agent.c
 
-LDADD+=	${LIBSSH} -lcrypto -lcrypt -lutil -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+LDADD+=	${LIBSSH} -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index b53e16491ee9..bd193ddf950c 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -2,10 +2,10 @@
 #
 
 PROG=	ssh-keygen
-SRCS=	key.c log-client.c ssh-keygen.c
+SRCS=	ssh-keygen.c
 
-LDADD+=	${LIBSSH} -lcrypto -lcrypt -lutil -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+LDADD+=	${LIBSSH} -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
new file mode 100644
index 000000000000..7a8c67547dd9
--- /dev/null
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+#
+
+PROG=	ssh-keyscan
+SRCS=	ssh-keyscan.c
+
+LDADD+=	${LIBSSH} -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
+
+.include <bsd.prog.mk>
+
+.PATH:	${SSHDIR}
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index fcb95d995ae8..66494a90e6db 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -8,8 +8,8 @@ BINMODE=4555
 LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
 MLINKS=	ssh.1 slogin.1
 
-SRCS=	ssh.c log-client.c readconf.c clientloop.c sshconnect.c \
-	sshconnect1.c sshconnect2.c
+SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
+	sshconnect.c sshconnect1.c sshconnect2.c
 
 .if defined(MAKE_KERBEROS4) && \
 	((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))