diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 8827f056127d..b290c86dc908 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=	ssh
+SHLIB_MAJOR=	2
 SRCS=	acss.c authfd.c authfile.c bufaux.c buffer.c \
 	canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \
 	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
@@ -11,6 +12,10 @@ SRCS=	acss.c authfd.c authfile.c bufaux.c buffer.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
+
+# 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 vis.c xcrypt.c xmmap.c
 # FreeBSD additions
@@ -25,7 +30,7 @@ DPADD=	${LIBZ}
 LDADD=	-lz
 
 .if !defined(NO_KERBEROS)
-CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
+CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
 LDADD+=	-lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
 .endif
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index b6bf897d660c..28cff683e037 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=   sftp-server
-SRCS=   sftp-common.c sftp-server.c
+SRCS=   sftp-server.c sftp-common.c
 MAN=	sftp-server.8
 CFLAGS+=-I${SSHDIR}
 
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 82476ab1a867..3f2ed519dcb0 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-keysign
-SRCS=	ssh-keysign.c msg.c readconf.c
+SRCS=	ssh-keysign.c readconf.c
 MAN=	ssh-keysign.8
 CFLAGS+=-I${SSHDIR}
 .if defined(ENABLE_SUID_SSH)
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 9a2bef7c8e61..08512e860457 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -4,8 +4,8 @@ PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
 CFLAGS+=-I${SSHDIR}
 
-DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD=	-lssh -lcrypt -lcrypto -lz
+DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT}
+LDADD=	-lssh -lcrypt -lcrypto -lz -ledit
 
 .include <bsd.prog.mk>
 
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index ef5f0c938df6..274e481e23f7 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -15,7 +15,7 @@ DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ}
 LDADD=	-lssh -lutil -lz
 
 .if !defined(NO_KERBEROS)
-CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
+CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	 ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
 LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
 .endif
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index a51b6d500a6d..4e73571084a5 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -12,7 +12,11 @@ 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 \
 	gss-genr.c
+
+# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
+
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR}
 
@@ -20,7 +24,7 @@ DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
 LDADD=	-lssh -lutil -lz -lwrap ${MINUSLPAM}
 
 .if !defined(NO_KERBEROS)
-CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
+CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	 ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
 LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
 .endif
@@ -32,17 +36,6 @@ CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT}
 LDADD+=	-lcrypto -lcrypt
 
-.if defined(OPENSSH_USE_POSIX_THREADS)
-.if ((${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "ia64") && !defined(NO_LIBPTHREAD)) || \
-    ((${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64") && \
-    !defined(NO_LIBC_R))
-CFLAGS+=-DUSE_POSIX_THREADS
-DPADD+= ${LIBPTHREAD}
-LDADD+= -lpthread
-.endif
-.endif
-
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}