diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 0f19a7bb99ec..faf7be0bd611 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -20,5 +20,5 @@ CFLAGS+= -DNO_IDEA
 .endif
 
 .if !defined(NO_OPENSSH)
-SSHDIR=		${.CURDIR}/../../../crypto/openssh
+SSHDIR=		${.CURDIR}/../../../crypto/openssh-portable
 .endif
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index e5146bb3cdff..7bfbdc31789b 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -8,8 +8,12 @@ SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
 	rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
 	key.c dispatch.c kex.c mac.c uuencode.c misc.c \
 	rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
-	scard.c monitor_wrap.c monitor_fdpass.c msg.c \
-	uidswap.c version.c
+	scard.c monitor_wrap.c monitor_fdpass.c msg.c
+# Portability layer
+SRCS+=	bsd-misc.c entropy.c
+# FreeBSD additions
+SRCS+=	version.c
+CFLAGS+=-I${SSHDIR}
 
 .if defined(COMPAT_GETADDRINFO)
 SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
@@ -20,4 +24,4 @@ LDADD=	-lcrypto -lz
 
 .include <bsd.lib.mk>
 
-.PATH:	${SSHDIR} ${SSHDIR}/lib
+.PATH:	${SSHDIR} ${SSHDIR}/openbsd-compat
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index c527ccfb24de..1b046adbd9e0 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
-#
 
 PROG=   sftp-server
 SRCS=   sftp-server.c sftp-common.c
 MAN=	sftp-server.8
+CFLAGS+=-I${SSHDIR}
 
-LDADD+=	-lssh -lcrypto
 DPADD+=	${LIBSSH} ${LIBCRYPTO}
+LDADD+=	-lssh -lcrypto
 
 .include <bsd.prog.mk>
 
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index 2264e39795ec..03f331619eae 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	scp
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH}
 LDADD=	-lssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 0f85afdccbc8..32fa7cdf6305 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO}
 LDADD=	-lssh -lcrypto
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index 654057527804..ab4a2b4009f0 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-add
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO}
 LDADD=	-lssh -lcrypto
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index c79fd24f805e..0fbd96d48096 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-agent
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO}
 LDADD=	-lssh -lcrypto
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index 99d1fb994106..8140cde80344 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-keygen
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO}
 LDADD=	-lssh -lcrypto
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
index 45e63d975f4a..6c9be5ec9e57 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-keyscan
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypto -lz
diff --git a/secure/usr.bin/ssh-keysign/Makefile b/secure/usr.bin/ssh-keysign/Makefile
index 0e1166b89861..5fdd6723fc24 100644
--- a/secure/usr.bin/ssh-keysign/Makefile
+++ b/secure/usr.bin/ssh-keysign/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	ssh-keysign
 MAN=	ssh-keysign.8
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypto -lz
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 82a8d007e152..d9ba6a7cac47 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -2,6 +2,7 @@
 #
 
 PROG=	ssh
+CFLAGS+=-I${SSHDIR}
 .if defined(ENABLE_SUID_SSH)
 BINMODE=4555
 .endif
@@ -21,7 +22,7 @@ DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
 
 .if defined(MAKE_KERBEROS5)
 DISTRIBUTION=krb5
-CFLAGS+= -DKRB5
+CFLAGS+= -DKRB5 -DHEIMDAL
 LDADD+=	 -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
 DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
 .endif
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 4987cef0ce7e..6cc3478b9bf4 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -9,10 +9,11 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	auth-skey.c auth-bsdauth.c monitor_mm.c monitor.c \
 	auth2-none.c auth2-passwd.c auth2-pubkey.c \
 	auth2-hostbased.c auth2-kbdint.c \
-	auth-pam.c auth2-pam.c
+	auth-pam.c auth2-pam.c auth2-pam-freebsd.c
+# Portability layer
+SRCS+=	loginrec.c
 MAN=	sshd.8 sshd_config.5
-
-CFLAGS+= -DLIBWRAP -DHAVE_LOGIN_CAP -DUSE_PAM -DHAVE_PAM_GETENVLIST
+CFLAGS+=-I${SSHDIR}
 
 .if defined(MAKE_KERBEROS4)
 DISTRIBUTION=krb4
@@ -24,13 +25,12 @@ DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
 
 .if defined(MAKE_KERBEROS5)
 DISTRIBUTION=krb5
-CFLAGS+= -DKRB5
+CFLAGS+= -DKRB5 -DHEIMDAL
 SRCS+=	auth-krb5.c
 LDADD+=	 -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken
 DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD}
 .endif
 
-CFLAGS+= -DSKEY
 LDADD+=	-lopie -lmd
 DPADD+=	${LIBOPIE} ${LIBMD}