diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index 92aa3085be1..f95966aaa5c 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2004/02/01 20:37:15 sturm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/02/09 18:13:17 sturm Exp $
 
 COMMENT=		"front-end to ssh-agent"
 
-DISTNAME=		keychain-2.0.2
+DISTNAME=		keychain-2.0.3
 CATEGORIES=		security
 
 HOMEPAGE=		http://www.gentoo.org/proj/en/keychain.xml
@@ -18,11 +18,14 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/
 EXTRACT_SUFX=		.tar.bz2
 
-NO_BUILD=		Yes
 NO_REGRESS=		Yes
 PKG_ARCH=		*
 
+do-build:
+	@perl -pi -e "s,bash_profile,profile," ${WRKDIST}/keychain{,.1}
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIST}/keychain ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKDIST}/keychain.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/keychain/distinfo b/security/keychain/distinfo
index d9b7b1be2f4..bc40c5de743 100644
--- a/security/keychain/distinfo
+++ b/security/keychain/distinfo
@@ -1,3 +1,3 @@
-MD5 (keychain-2.0.2.tar.bz2) = 931bab773fe6cc438b07694a6f22e819
-RMD160 (keychain-2.0.2.tar.bz2) = ed52d183995dd74ebf542a33f679d46ee969f3fc
-SHA1 (keychain-2.0.2.tar.bz2) = fb32a11dad1d9f11d5a75c49d07288eef33c4909
+MD5 (keychain-2.0.3.tar.bz2) = 1183410bac4a747cd9ae483a1f24b7c5
+RMD160 (keychain-2.0.3.tar.bz2) = 4746c9ff49bb14a32fb7d94983fbcf59677cc875
+SHA1 (keychain-2.0.3.tar.bz2) = 417ad52101ac5069f54fb6ddd66ad787026c0d1e
diff --git a/security/keychain/patches/patch-keychain b/security/keychain/patches/patch-keychain
deleted file mode 100644
index c3e5bd19c7b..00000000000
--- a/security/keychain/patches/patch-keychain
+++ /dev/null
@@ -1,39 +0,0 @@
-$OpenBSD: patch-keychain,v 1.3 2002/09/01 20:49:31 naddy Exp $
---- keychain.orig	Tue Aug 27 03:23:19 2002
-+++ keychain	Sun Sep  1 22:51:16 2002
-@@ -4,7 +4,7 @@
- # Author: Daniel Robbins <drobbins@gentoo.org>
- # $Header: /home/cvs/ports/security/keychain/patches/Attic/patch-keychain,v 1.3 2002/09/01 20:49:31 naddy Exp $
- 
--version=2.0.1
-+version=2.0.2
- 
- PATH="/sbin:/usr/sbin:${PATH}:/usr/ucb"; export PATH;
- 
-@@ -67,7 +67,7 @@ then
- 
- Description:
- 
-- Keychain is an OpenSSH key manager, typically run from ~/.bash_profile.  When
-+ Keychain is an OpenSSH key manager, typically run from ~/.profile.  When
-  run, it will make sure ssh-agent is running; if not, it will start ssh-agent.
-  It will redirect ssh-agent's output to ~/.keychain/[hostname]-sh, so that cron
-  jobs that need to use ssh-agent keys can simply source this file and make the
-@@ -78,7 +78,7 @@ Description:
-  added by keychain.
- 
-  Typically, one uses keychain by adding the following to the top of their
-- ~/.bash_profile (or ~/.zlogin, in case of zsh):
-+ ~/.profile (or ~/.zlogin, in case of zsh):
- 
- EOHELP
- 	echo $E "  ${CYAN}keychain ~/.ssh/id_rsa ~/.ssh/id_dsa"
-@@ -109,7 +109,7 @@ EOHELP
- 	echo
- 	cat <<EOHELP
-  Tells keychain to delete all of ssh-agent's host keys.  Typically, This is
-- used in the ~/.bash_profile.  The theory behind this is that keychain should
-+ used in the ~/.profile.  The theory behind this is that keychain should
-  assume that you are an intruder until proven otherwise.  However, while this
-  option increases security, it still allows your cron jobs to use your ssh keys
-  when you're logged out.
diff --git a/security/keychain/pkg/MESSAGE b/security/keychain/pkg/MESSAGE
deleted file mode 100644
index 135022caaad..00000000000
--- a/security/keychain/pkg/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-
-+---------------
-| For instructions on how to configure keychain, please run
-|
-|   keychain -h
-|
-| There is no man page for this program.
-+---------------
-
diff --git a/security/keychain/pkg/PLIST b/security/keychain/pkg/PLIST
index a34c8daeeeb..3e14f831064 100644
--- a/security/keychain/pkg/PLIST
+++ b/security/keychain/pkg/PLIST
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/03/07 17:37:38 espie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/02/09 18:13:18 sturm Exp $
 bin/keychain
+man/man1/keychain.1