diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
new file mode 100644
index 000000000000..563a156f399b
--- /dev/null
+++ b/secure/lib/libssh/Makefile
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+
+SSHSRC=	${.CURDIR}/../../../crypto/openssh
+
+LIB=	ssh
+SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
+	cipher.c compat.c compress.c crc32.c deattack.c fingerprint.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 \
+	strlcat.c strlcpy.c
+
+NOPIC=	yes
+
+install:
+
+.if defined(COMPAT_GETADDRINFO)
+SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
+.endif
+
+.include <bsd.own.mk>
+
+.PATH:		${SSHSRC}
+.PATH:		${SSHSRC}/lib
+
+.if defined(MAKE_KERBEROS4) && \
+	((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
+CFLAGS+= -DKRB4
+.endif # MAKE_KERBEROS4
+
+.if defined(MAKE_KERBEROS5) && \
+	((${MAKE_KERBEROS5} == "yes") || (${MAKE_KERBEROS5} == "YES"))
+CFLAGS+= -DKRB5
+.endif # MAKE_KERBEROS5
+
+.include <bsd.lib.mk>
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
new file mode 100644
index 000000000000..896f62ccd748
--- /dev/null
+++ b/secure/usr.bin/scp/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+#
+
+SSHSRC=	${.CURDIR}/../../../crypto/openssh
+
+PROG=	scp
+BINOWN=	root
+BINMODE=555
+MAN1=	scp.1
+
+SRCS=	scp.c
+
+.include <bsd.prog.mk>
+
+.PATH:		${SSHSRC}
+
+LDADD+=	-lcrypto -lutil -lz -L${.OBJDIR}/../../lib/libssh -lssh
+DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
+.if defined(RSAREF) && ${RSAREF} == YES
+LDADD+=	-lRSAglue
+DPADD+= ${LIBRSAGLUE}
+.endif
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
new file mode 100644
index 000000000000..bd53d7222d1d
--- /dev/null
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+#
+
+SSHSRC=	${.CURDIR}/../../../crypto/openssh
+
+PROG=	ssh-add
+BINOWN=	root
+BINMODE=555
+MAN1=	ssh-add.1
+
+SRCS=	ssh-add.c log-client.c
+
+.include <bsd.prog.mk>
+
+.PATH:		${SSHSRC}
+
+LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
+DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+.if defined(RSAREF) && ${RSAREF} == YES
+LDADD+=	-lRSAglue
+DPADD+= ${LIBRSAGLUE}
+.endif
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
new file mode 100644
index 000000000000..dc30ead0a5f5
--- /dev/null
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+#
+
+SSHSRC=	${.CURDIR}/../../../crypto/openssh
+
+PROG=	ssh-agent
+BINOWN=	root
+BINMODE=555
+MAN=	ssh-agent.1
+
+SRCS=	ssh-agent.c log-client.c
+
+.include <bsd.prog.mk>
+
+.PATH:		${SSHSRC}
+
+LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
+DPADD+=	${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+.if defined(RSAREF) && ${RSAREF} == YES
+LDADD+=	-lRSAglue
+DPADD+= ${LIBRSAGLUE}
+.endif
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
new file mode 100644
index 000000000000..962ad41d4de9
--- /dev/null
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+#
+
+SSHSRC=	${.CURDIR}/../../../crypto/openssh
+
+PROG=	ssh-keygen
+BINOWN=	root
+BINMODE=555
+MAN=	ssh-keygen.1
+
+SRCS=	ssh-keygen.c log-client.c
+
+.include <bsd.prog.mk>
+
+.PATH:		${SSHSRC}
+
+LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
+DPADD+=	${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+.if defined(RSAREF) && ${RSAREF} == YES
+LDADD+=	-lRSAglue
+DPADD+= ${LIBRSAGLUE}
+.endif
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
new file mode 100644
index 000000000000..3741ba405550
--- /dev/null
+++ b/secure/usr.bin/ssh/Makefile
@@ -0,0 +1,41 @@
+# $FreeBSD$
+#
+
+SSHSRC=	${.CURDIR}/../../../crypto/openssh
+
+PROG=	ssh
+BINOWN=	root
+BINMODE=4555
+MAN1=	ssh.1
+LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
+MLINKS=	ssh.1 slogin.1
+
+SRCS=	ssh.c sshconnect.c log-client.c readconf.c clientloop.c
+
+.include <bsd.own.mk>
+
+.PATH:		${SSHSRC}
+.PATH:		${SSHSRC}/lib
+
+.if defined(MAKE_KERBEROS4) && \
+	((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
+CFLAGS+= -DKRB4
+LDADD+=	 -lkrb -lcom_err
+DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
+.endif # MAKE_KERBEROS4
+
+.if defined(MAKE_KERBEROS5) && \
+	((${MAKE_KERBEROS5} == "yes") || (${MAKE_KERBEROS5} == "YES"))
+CFLAGS+= -DKRB5
+LDADD+=	 -lkrb5 -lcom_err
+DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR}
+.endif # MAKE_KERBEROS5
+
+.include <bsd.prog.mk>
+
+LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lutil -lz
+DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
+.if defined(RSAREF) && ${RSAREF} == YES
+LDADD+=	-lRSAglue
+DPADD+= ${LIBRSAGLUE}
+.endif
diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile
new file mode 100644
index 000000000000..041f303f47ac
--- /dev/null
+++ b/secure/usr.sbin/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+SUBDIR= 
+.if !defined(NO_OPENSSH)
+SUBDIR+=sshd
+.endif
+
+.include <bsd.subdir.mk>
diff --git a/secure/usr.sbin/Makefile.inc b/secure/usr.sbin/Makefile.inc
new file mode 100644
index 000000000000..928489badaec
--- /dev/null
+++ b/secure/usr.sbin/Makefile.inc
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+BINDIR=	/usr/sbin
+.include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
new file mode 100644
index 000000000000..6a36c290f5c4
--- /dev/null
+++ b/secure/usr.sbin/sshd/Makefile
@@ -0,0 +1,43 @@
+# $FreeBSD$
+#
+
+SSHSRC=	${.CURDIR}/../../../crypto/openssh
+
+PROG=	sshd
+BINOWN=	root
+BINMODE=555
+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
+
+CFLAGS=	-DLIBWRAP
+
+.include <bsd.own.mk>
+
+.PATH:		${SSHSRC}
+
+.if defined(MAKE_KERBEROS4) && \
+	((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
+CFLAGS+= -DKRB4
+SRCS+=	auth-krb4.c
+LDADD+=	 -lkrb -lcom_err
+DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
+.endif # MAKE_KERBEROS4
+
+.if defined(MAKE_KERBEROS5) && \
+	((${MAKE_KERBEROS5} == "yes") || (${MAKE_KERBEROS5} == "YES"))
+CFLAGS+= -DKRB5
+SRCS+=	auth-krb5.c
+LDADD+=	 -lkrb5 -lcom_err
+DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR}
+.endif # MAKE_KERBEROS5
+
+.include <bsd.prog.mk>
+
+LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap
+DPADD+=	${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP}
+.if defined(RSAREF) && ${RSAREF} == YES
+LDADD+=	-lRSAglue
+DPADD+= ${LIBRSAGLUE}
+.endif