diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 899a8794624..c4496529736 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,15 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 1999/02/05 07:14:21 fgsch Exp $
+# $OpenBSD: Makefile,v 1.3 1999/11/24 03:33:55 brad Exp $
 
 DISTNAME=	pgp50i-unix-src
 PKGNAME=	pgp-5.0i
 CATEGORIES=	security
-
-NO_CDROM=	"CRYPTO: Third party crypto not allowed."
-RESTRICTED=	"Crypto; export-controlled"
-MIRROR_DISTFILE=no
-
-MAINTAINER=	fgsch@openbsd.org
-
 MASTER_SITES=	ftp://ftp.no.pgpi.com/pub/pgp/5.0/unix/ \
 		ftp://ftp.at.pgpi.com/pub/pgpi/5.0/unix/ \
 		ftp://ftp.cz.pgpi.com/pub/pgpi/5.0/unix/ \
@@ -25,26 +18,30 @@ MASTER_SITES=	ftp://ftp.no.pgpi.com/pub/pgp/5.0/unix/ \
 		ftp://ftp.se.pgpi.com/pub/pgp/5.0/unix/ \
 		ftp://ftp.ch.pgpi.com/pub/pgp/5.0/unix/
 
-# Need to add rsaref for US residents
-#
-.if defined(NO_WARNINGS) || (defined(USA_RESIDENT) && ${USA_RESIDENT} == YES)
-MASTER_SITES+=	\
-	ftp://nic.funet.fi/pub/crypt/mirrors/ftp.dsi.unimi.it/applied-crypto/ \
-	ftp://idea.dsi.unimi.it/pub/security/crypt/math/
-DISTFILES=	\
-	${DISTNAME}${EXTRACT_SUFX} \
-	rsaref2.tar.gz
+MASTER_SITES0=	http://the.wiretapped.net/security/cryptography/libs/rsa/ \
+		ftp://idea.dsi.unimi.it/pub/security/crypt/math/ \
+		ftp://ftp.it.net.au/mirrors/crypto/misc/
+
+NO_CDROM=	"CRYPTO: Third party crypto not allowed."
+RESTRICTED=	"Crypto; export-controlled"
+MIRROR_DISTFILE=no
+
+NEED_VERSION=	1.121
+
+MAINTAINER=	fgsch@openbsd.org
+
+.if defined(NO_WARNINGS) || (defined(USA_RESIDENT) && ${USA_RESIDENT:U} == YES)
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} rsaref2.tar.gz:0
 .endif
 
 GNU_CONFIGURE=	yes
 
 NO_PACKAGE=	yes
-
 WRKSRC=		${WRKDIR}/pgp50i/src
 
-.if !defined(NO_WARNINGS)
 pre-fetch:
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
+.if !defined(NO_WARNINGS)
+.if !defined(USA_RESIDENT) || ${USA_RESIDENT:U} != YES && ${USA_RESIDENT:U} != NO
 	@${ECHO} ""
 	@${ECHO} The variable USA_RESIDENT must be set to either YES or NO
 	@${ECHO} in order to build this package.  USA residents that are
@@ -58,10 +55,8 @@ pre-fetch:
 .endif
 .endif
 
-# RSAREF2 doesn't work as is when sizeof( long) != 4 -- fix it
-#
 pre-patch:
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+.if defined(USA_RESIDENT) && ${USA_RESIDENT:U} == YES
 	@${MKDIR} ${PATCHDIR}
 	@${CP} ${FILESDIR}/patch-rsaref2 ${PATCHDIR}
 	@${LN} -sf ${WRKDIR}/rsaref2 ${WRKDIR}/pgp50i/rsaref
@@ -69,14 +64,11 @@ pre-patch:
 
 post-patch:
 	@${MV} ${WRKSRC}/man/pgp.1 ${WRKSRC}/man/pgp5.1
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+.if defined(USA_RESIDENT) && ${USA_RESIDENT:U} == YES
 	@${RM} ${PATCHDIR}/patch-rsaref2
 .endif
 
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-# Force RSAREF to be used by making sure that rsaref.a exists and
-# that configure does not find lib/pgp/pubkey/pgpRSAGlue1.c.
-#
+.if defined(USA_RESIDENT) && ${USA_RESIDENT:U} == YES
 pre-configure:
 	@(cd ${WRKDIR}/rsaref2/install/unix && \
 	  ${SETENV} ${MAKE_ENV} ${MAKE} -f makefile rsaref.a)
@@ -85,7 +77,7 @@ pre-configure:
 .endif
 
 pre-install:
-	-${MKDIR} ${PREFIX}/lib/pgp5
+	@${MKDIR} ${PREFIX}/lib/pgp5
 	@${INSTALL_DATA} ${WRKSRC}/language50.txt ${PREFIX}/lib/pgp5
 
 .include <bsd.port.mk>