diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 947f13a6fbb0..3c3e0b6eb0f7 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -4,11 +4,11 @@
 SSHSRC=	${.CURDIR}/../../../crypto/openssh
 
 LIB=	ssh
-SRCS=   authfd.c authfile.c aux.c bufaux.c buffer.c canohost.c channels.c \
-	cipher.c compat.c compress.c crc32.c deattack.c fingerprint.c \
+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
+	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c
 
 NOPIC=	yes
 
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
new file mode 100644
index 000000000000..731676c4621d
--- /dev/null
+++ b/secure/libexec/sftp-server/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+#
+
+SSHSRC=	${.CURDIR}/../../../crypto/openssh
+
+.PATH:		${SSHSRC}
+#.PATH:		${SSHSRC}/lib
+
+PROG=   sftp-server
+BINOWN= root
+
+BINMODE?=555
+
+BINDIR= /usr/libexec
+MAN8=    sftp-server.8
+
+SRCS=   sftp-server.c log-server.c
+
+.include <bsd.prog.mk>
+
+LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto
+DPADD+=	${LIBCRYPTO}
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 3ea618697a16..10dcbf0f8f09 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -34,11 +34,11 @@ LDADD+=	 -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/librok
 DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
 .endif # MAKE_KERBEROS5
 
-.include <bsd.prog.mk>
-
 .if defined(X11BASE)
 CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
 .endif
 
 LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lutil -lz
 DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
+
+.include <bsd.prog.mk>
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index d3d0bb31a02d..74b9ee54cc8a 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -11,9 +11,9 @@ 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 login_access.c
+	auth.c auth1.c auth2.c auth-options.c session.c login_access.c
 
-CFLAGS+= -DLIBWRAP -DLOGIN_ACCESS -DLOGIN_CAP -I${LOGINSRC}
+CFLAGS+= -DLIBWRAP -DHAVE_LOGIN_CAP -DLOGIN_ACCESS -I${LOGINSRC}
 
 .include <bsd.own.mk>
 
@@ -43,5 +43,9 @@ DPADD+=	${LIBOPIE} ${LIBMD}
 
 .include <bsd.prog.mk>
 
+.if defined(X11BASE)
+CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
+.endif
+
 LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap
 DPADD+=	${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP}