4 files changed, 11 insertions, 10 deletions

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index ec65f68361c4..033fc1e015a5 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -9,18 +9,19 @@ SRCS=	acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
 	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
 	compat.c compress.c crc32.c deattack.c fatal.c hostfile.c \
 	log.c match.c md-sha256.c moduli.c nchan.c packet.c \
-	readpass.c rsa.c ttymodes.c xmalloc.c \
+	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
 	atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
 	monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \
 	kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
-	entropy.c scard-opensc.c
+	entropy.c scard-opensc.c umac.c
 
 # gss-genr.c should be in $SRCS but causes linking problems, so it is
 # compiled directly into sshd instead.
 
 # Portability layer
-SRCS+=	bsd-closefrom.c bsd-misc.c getrrsetbyname.c \
-	port-tun.c strtonum.c vis.c xcrypt.c xmmap.c
+SRCS+=	bsd-arc4random.c bsd-closefrom.c bsd-misc.c fmt_scaled.c \
+	getrrsetbyname.c openssl-compat.c port-tun.c strtonum.c \
+	vis.c xcrypt.c xmmap.c
 # FreeBSD additions
 SRCS+=	version.c
 
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 9323bb742831..22ce649452f1 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=   sftp-server
-SRCS=   sftp-server.c sftp-common.c
+SRCS=   sftp-server.c sftp-common.c sftp-server-main.c
 MAN=	sftp-server.8
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 33bdba1b2088..11ab8633f645 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -10,7 +10,7 @@ MAN=	ssh.1 ssh_config.5
 MLINKS=	ssh.1 slogin.1
 
 SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
-	sshconnect.c sshconnect1.c sshconnect2.c \
+	sshconnect.c sshconnect1.c sshconnect2.c mux.c \
 	gss-genr.c
 
 DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ}
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 9a9ddaee368c..dff3f97ed7d6 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -14,7 +14,7 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	auth-krb5.c \
 	auth2-gss.c gss-serv.c gss-serv-krb5.c \
 	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
-	audit.c audit-bsm.c platform.c \
+	audit.c audit-bsm.c platform.c sftp-server.c sftp-common.c \
 	gss-genr.c
 
 # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
@@ -32,9 +32,9 @@ LDADD+=  -lbsm
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} != "no"
-CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
-DPADD+=	 ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
-LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
+CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DHAVE_GSSAPI_GSSAPI_KRB5_H=1 -DKRB5 -DHEIMDAL
+DPADD+=	 ${LIBGSSAPI} ${LIBGSSAPI_KRB5}
+LDADD+=	 -lgssapi -lgssapi_krb5
 .endif
 
 .if defined(X11BASE)