diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 46164016062a..34c6e1065c66 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -6,9 +6,9 @@
 # $FreeBSD$
 #
 
-DISTNAME=	OpenSSH-1.2
-CATEGORIES=	security
-MASTER_SITES=	# see ${SCRIPTDIR}/fetchit
+DISTNAME=	src/usr.bin/ssh
+PKGNAME=	OpenSSH-1.2
+CATEGORIES=	security net
 
 MAINTAINER=	green@FreeBSD.org
 
@@ -16,29 +16,56 @@ LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl
 
 RESTRICTED=	"Links with cryptographic code."
 
-# Here, MANDIR is concetenated to DESTDIR which all forms the man install dir...
-MAKE_ENV=	DESTDIR=${PREFIX} MANDIR=/man/man
+.include <bsd.port.pre.mk>
+CAT?=		/bin/cat
+DISTFILES!=	${CAT} ${FILESDIR}/distfiles
+
+CVS_CMD?=	cvs -z3
+CVS_DATE=	Fri Nov 12 20:27:53 EST 1999
+CVS_SITE?=	anoncvs@anoncvs1.ca.openbsd.org:/cvs
+CRYPTOLIBS=	-L${PREFIX}/lib -lcrypto
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-MAKE_ENV+=	CRYPTOLIBS="-L${PREFIX}/lib -lcrypto -lRSAglue -lrsaref"
-.else
-MAKE_ENV+=	CRYPTOLIBS="-L${PREFIX}/lib -lcrypto"
+CRYPTOLIBS+=	-lRSAglue -lrsaref
 .endif
+# Here, MANDIR is concetenated to DESTDIR which all forms the man install dir...
+MAKE_ENV=	DESTDIR=${PREFIX} MANDIR=/man/man CRYPTOLIBS="${CRYPTOLIBS}"
 .if !exists(/usr/include/tcpd.h)
 MAKE_ENV+=	TCP_WRAPPERS=NO
 .endif
-NO_CHECKSUM=	YES
+STAMPFILE=	${DISTDIR}/${PKGNAME}/.stamp
 WRKSRC=		${WRKDIR}/ssh
 
 do-fetch:
-	@if [ ! -e ${WRKDIR}/.fetch_done ]; then \
-		${SETENV} WRKDIR=${WRKDIR} ${SCRIPTDIR}/fetchit || exit 1; \
-		${TOUCH} ${WRKDIR}/.fetch_done; \
+	@if [ ! -e ${STAMPFILE} ] || \
+	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
+		unset CVS_RSH CVS_SERVER || ${TRUE}; \
+		${MKDIR} ${DISTDIR}/${PKGNAME} && \
+		cd ${DISTDIR}/${PKGNAME} && \
+		${CVS_CMD} -d ${CVS_SITE} co -D "${CVS_DATE}" ${DISTNAME} && \
+		${ECHO} -n ${CVS_DATE} > ${STAMPFILE}; \
 	fi
 
 do-extract:
+	@${MKDIR} ${WRKDIR}
+	@${CP} -r ${DISTDIR}/${PKGNAME}/${DISTNAME} ${WRKDIR}
 	@${CP} ${FILESDIR}/strlcpy.c ${WRKSRC}/lib/
 
+post-patch:
+	@${PERL} -pi.orig -e 's:_PATH_STDPATH:_PATH_STDPATH "${PREFIX}/bin":' \
+		${WRKSRC}/sshd.c
+	@${PERL} -pi.orig -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/ssh.h
+	@${PERL} -pi.orig -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/sshd_config
+
 pre-install:
 	@cd ${WRKSRC} && ${MAKE} DESTDIR=${PREFIX} distribution
 
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/sshd.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/sshd.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/sshd ] && ${PREFIX}/sbin/sshd &&" \
+			"${ECHO} -n ' sshd'" >> ${PREFIX}/etc/rc.d/sshd.sh; \
+		${CHMOD} 755 ${PREFIX}/etc/rc.d/sshd.sh; \
+	fi
+
 .include <bsd.port.mk>
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 8b137891791f..4b3adad1e465 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1 +1,91 @@
-
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/lib/Makefile) = f8ea9d03d277967a45f5e0d677762d30
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp/Makefile) = 5cb4c5fcabde5ccc4f9ca475ac3452f4
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/COPYING.Ylonen) = d8416f438a512281d230790c8487ce0b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ChangeLog) = afe0acb540f878018ff1f01995e6cdd3
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/Makefile) = 7f10222699e8a34758fe63d0c7df6806
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/Makefile.inc) = 8f096d4d5a830efe7dde5674b482cd2b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/OVERVIEW) = 2aa4be725bbc218e97ca89e5f8bb181b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/README) = a744582db9d285ffbc55030ced3d87d5
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/RFC.nroff) = 1615f30810a3d47716883b2eaddd712c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-krb4.c) = 6edabbf55a913c9c44ef6b36390ea4be
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-passwd.c) = dd6381fb76a253e47e423dd1034f0cb4
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rh-rsa.c) = e44488b9ddcdaa09230f34bb3b7545fa
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rhosts.c) = 8ad4c4ed2d84f4ec6dea0c54209ffc13
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rsa.c) = 35eff425d02403f5f4991fb450d1f32b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-skey.c) = b06ddb3c15f79fc3f566e384db648b62
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.c) = 69de44afa5afe230f31cded7ad730687
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.h) = 5655f3f400fc6db0e8e288c3a43bc714
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfile.c) = 83796ca9b5c914d0a29a58adc13816db
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/bufaux.c) = b9c43d1b9fb421e6b737f420b94076ab
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/bufaux.h) = e4f6b704a67973170d44695f3b566f05
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/buffer.c) = 865053f2a0255aded2599461618d76e5
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/buffer.h) = ad31925577a5b090b36afc0858ee4ef8
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/canohost.c) = 17a9284595f11571f8a7d774c2d4c8d6
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/crc32.c) = dd58bbe867cfe914f37a39c757ccd4b5
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/channels.c) = 0d41a91415bf02c246810d1b0d8fb6bd
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/channels.h) = 72d03b7b023c7d794c28b38ce43d9e5b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.c) = 45f7af7b8007328906639ae1a70bbe72
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.h) = 305a9edc17d5b10ff4af3cb4b9f23d3c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/clientloop.c) = 35d83161add433f156605ad6ef1f0a7c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/compat.c) = 6bac0ff0847f26f16b3f11f47d56c367
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/compat.h) = 8d4063d6eb22bd9b9aba4f768a96ce65
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/compress.c) = ce3d346cb5e9a894196c8447bfc60e14
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/compress.h) = 47384fb71f7411a8367fc2ab92bc60cf
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/crc32.h) = ca822d3b56144b7f3ebf23505696df64
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/deattack.c) = 688e2300af960a6b88cc7af582276b77
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/deattack.h) = 84cd5fc5ab5857659c337495f13e97af
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/getput.h) = 564761caa67f9c507e73b2383f86dc0c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/hostfile.c) = 8a2a731b0df42fc69232235ea2d538e5
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/includes.h) = 21a803e66cf63001eaf3fd22bf6c2b54
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/log-client.c) = 68418f7939765d0abee948d5cc169ab5
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/log-server.c) = 1bf80fc8c24e43643886af486b4ff7c3
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/log.c) = 80b576a3a50316fb10af6d374faf29d1
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/login.c) = b9700635ffbdcc489613eabf26e93214
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/match.c) = 559b73caeb055519cab5f403e412b099
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.c) = ee3f89360b5ab19e88d7a5eb5270f59b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.h) = 5394ef9021c3394c2b0aeba22b18426e
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.c) = a4ec43de3e4b9687e76e14b22d701ba2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.h) = fc559438a23bf1c4f6e7faaaf5f581a4
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.ms) = 6a168c05b13aed9a6c9b9d384edcf2c2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.c) = e79e440c02605a629578609e9b625d9c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh/Makefile) = 41b006d3c04b599619990b47da60f81e
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.h) = 0a4004c7f560485793487457dab838c2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/pty.c) = 0f62619cb5f1622a1d0940993b6bb5e9
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/pty.h) = c42c8189284dfe0d34125b77446bd062
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/radix.c) = 0e98d49a6f27cb09480f38c9dfce9b62
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/readconf.c) = 632760405a5f76a97761972d8bf84f03
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/readconf.h) = fe45e3cf035f3f2acee3269eaef2e7e9
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/readpass.c) = 88a5e2a41c43d53d3dac739f7110e3db
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/rsa.c) = 60f3f3aa33911742feb13032e06fb6a1
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/rsa.h) = b4175dcd58022ac6961ac57a255718a7
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp.1) = a9144b2b272d8ac656b1d63c71644999
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp.c) = dbe9a6bd347ef622e1248751ff2707b2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.c) = 751b822fb21c816b40b457cf0b736c11
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.h) = 468c25070e4afbccf948730311690a34
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/serverloop.c) = 3462fbffbcac79a61c333ce8561fac7a
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.1) = db457a15c9bcc6709c5911c969fbbee7
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.c) = 256dc8474f58f56c5699ca949f1d1a18
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.1) = 9c14e6863f382158793f122a61cab429
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.c) = 208fb65fba423e338920b0015f1cd22c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.1) = 74b7482f75183f6f1f7a7574b69c2f21
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.c) = ae844594322a8da0805e5381a62b8331
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.1) = 955a39c28fef60670ced4205dbf7aa71
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.c) = fe25deb913a46480089b8207df48e1fd
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.h) = cd8c5167b6008fef45a2b009d5c5c393
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh_config) = 9658715526aeaf0bc43528d3159b475f
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshconnect.c) = 0def7e829c84933b22b8efa7de94f470
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.8) = 97965e2d3844e6bc5979dcaa268af7bb
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.c) = 30de65c7412ec9fa464cd3ce1e044910
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd_config) = e78b81c34da5c97eee1359cccda908d6
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/tildexpand.c) = 6f797f65e32fe1022ee20f291611a6e2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ttymodes.c) = b11079749fc93e0a8337af4afb3ebc43
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ttymodes.h) = 4fbb0096420efed3228d92e1576242d1
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/uidswap.c) = 9caf5b2cd7e5535dde520fd40ad732e0
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/uidswap.h) = 5af5b193e6325f20e7de4ee15877b877
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/version.h) = 6ac6f1622b0ce6f24f608f0bb340e207
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/xmalloc.c) = 46e87856bb156c71e91403580a330480
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/xmalloc.h) = 5ec9a25c413bf89488fe3140d2e06d7d
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add/Makefile) = f780e2e9fb5c32d2118ba0e612d681e0
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent/Makefile) = c7ec7c4e61b4da3369980f197fdcb501
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen/Makefile) = 2d597b6e6458d0c0246ba2563dd2498b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd/Makefile) = d1d83d1ece775d3a5cbf8cfaaf2330f3
diff --git a/security/openssh/pkg-descr b/security/openssh/pkg-descr
index 30205117b4a3..77313af4448f 100644
--- a/security/openssh/pkg-descr
+++ b/security/openssh/pkg-descr
@@ -4,5 +4,11 @@ rsh, rcp, etc. and provide secure encrypted communications between two
 untrusted hosts over an insecure network.  X11 connections and arbitrary
 TCP/IP ports can also be forwarded over the secure channel.
 
+OpenSSH is a version of Secure Shell based upon a much less encumbered
+SSH version 1.2.12, which has a BSD-style license.  Maintained by the
+OpenBSD project, this is the most free and secure SSH implementation
+in the world.  OpenSSH supports SSH protocol version 1.5 and has all
+known bugs from SSH fixed.
+
 - Brian Feldman
 green@FreeBSD.org
diff --git a/security/openssh/pkg-plist b/security/openssh/pkg-plist
index d49a5d5efcdd..22342ca2975d 100644
--- a/security/openssh/pkg-plist
+++ b/security/openssh/pkg-plist
@@ -3,6 +3,7 @@ bin/ssh
 bin/ssh-add
 bin/ssh-agent
 bin/ssh-keygen
+etc/rc.d/sshd.sh
 etc/ssh_config
 etc/sshd_config
 man/man1/scp.1.gz
@@ -13,3 +14,4 @@ man/man1/ssh-keygen.1.gz
 man/man1/ssh.1.gz
 man/man8/sshd.8.gz
 sbin/sshd
+@exec if [ ! -f %D/etc/ssh_host_key ]; then echo "Generating a secret host key..."; %D/bin/ssh-keygen -N "" -f %D/etc/ssh_host_key; fi