diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 7a07bca5ba9a..aa4529d69d1e 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -1,45 +1,48 @@
-# $NetBSD: Makefile,v 1.19 2009/04/11 23:15:21 sno Exp $
+# $NetBSD: Makefile,v 1.20 2010/02/12 18:26:36 sno Exp $
 #
 
-DISTNAME=		Crypt-OpenPGP-1.03
+DISTNAME=		Crypt-OpenPGP-1.04
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		5
+#PKGREVISION=		5
 SVR4_PKGNAME=		p5pgp
 CATEGORIES=		security perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Crypt/}
 
 MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Crypt-OpenPGP/
-COMMENT=		Perl5 module for OpenPGP support
+COMMENT=		Pure-Perl OpenPGP implementation
+LICENSE=		${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=		p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
 DEPENDS+=		p5-Crypt-Blowfish-[0-9]*:../../security/p5-Crypt-Blowfish
 DEPENDS+=		p5-Crypt-CAST5_PP-[0-9]*:../../security/p5-Crypt-CAST5_PP
 DEPENDS+=		p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
 DEPENDS+=		p5-Crypt-DES_EDE3-[0-9]*:../../security/p5-Crypt-DES_EDE3
-DEPENDS+=		p5-Crypt-DSA-[0-9]*:../../security/p5-Crypt-DSA
-DEPENDS+=		p5-Crypt-Rijndael-[0-9]*:../../security/p5-Crypt-Rijndael
-DEPENDS+=		p5-Crypt-RIPEMD160-[0-9]*:../../security/p5-Crypt-RIPEMD160
+DEPENDS+=		p5-Crypt-DSA>=1.16nb1:../../security/p5-Crypt-DSA
+DEPENDS+=		p5-Crypt-RIPEMD160>=0.04nb4:../../security/p5-Crypt-RIPEMD160
 DEPENDS+=		p5-Crypt-RSA-[0-9]*:../../security/p5-Crypt-RSA
+DEPENDS+=		p5-Crypt-Rijndael-[0-9]*:../../security/p5-Crypt-Rijndael
 DEPENDS+=		p5-Crypt-Twofish>=2.00:../../security/p5-Crypt-Twofish
 DEPENDS+=		p5-Data-Buffer>=0.04:../../devel/p5-Data-Buffer
-DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=		p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
+DEPENDS+=		p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
+DEPENDS+=		p5-File-HomeDir-[0-9]*:../../devel/p5-File-HomeDir
+DEPENDS+=		p5-Math-Pari-[0-9]*:../../math/p5-Math-Pari
+DEPENDS+=		{perl>=5.7.3,p5-MIME-Base64-[0-9]*}:../../converters/p5-MIME-Base64
+DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
 # contains LWP::UserAgent
 DEPENDS+=		p5-libwww>=5.10:../../www/p5-libwww
-DEPENDS+=		p5-Math-Pari-[0-9]*:../../math/p5-Math-Pari
-DEPENDS+=		p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
-# hmmm
-#DEPENDS+=		p5-Crypt-IDEA-[0-9]*:../../security/p5-Crypt-IDEA
+
+BUILD_DEPENDS+=		p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-MAKE_ENV+=		PERL_EXTUTILS_AUTOINSTALL=--skipdeps
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Crypt/OpenPGP/.packlist
+PERL5_MODULE_TYPE=	Module::Install::Bundled
+
+.include "options.mk"
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Crypt-OpenPGP/distinfo b/security/p5-Crypt-OpenPGP/distinfo
index e9aac3d9fe48..54c60ecfd513 100644
--- a/security/p5-Crypt-OpenPGP/distinfo
+++ b/security/p5-Crypt-OpenPGP/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:10:10 agc Exp $
+$NetBSD: distinfo,v 1.5 2010/02/12 18:26:36 sno Exp $
 
-SHA1 (Crypt-OpenPGP-1.03.tar.gz) = 5f3f744d2a44f415e057f2ceef0f026c79d3d0b7
-RMD160 (Crypt-OpenPGP-1.03.tar.gz) = 64fa8389af322cb26d8fc6434022c8fa91509507
-Size (Crypt-OpenPGP-1.03.tar.gz) = 96872 bytes
+SHA1 (Crypt-OpenPGP-1.04.tar.gz) = 492a0b357086ef266721f984903c6fb81605ed8d
+RMD160 (Crypt-OpenPGP-1.04.tar.gz) = 784e915b5a9925fdea6c7ff0fae491cdbf2fe392
+Size (Crypt-OpenPGP-1.04.tar.gz) = 108477 bytes
diff --git a/security/p5-Crypt-OpenPGP/options.mk b/security/p5-Crypt-OpenPGP/options.mk
new file mode 100644
index 000000000000..1fe0b9d2fe1b
--- /dev/null
+++ b/security/p5-Crypt-OpenPGP/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2010/02/12 18:26:36 sno Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-Crypt-OpenPGP
+PKG_SUPPORTED_OPTIONS=	pgp2-compat
+PKG_SUGGESTED_OPTIONS=	# empty
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpgp2-compat)
+DEPENDS+=		p5-Crypt-IDEA-[0-9]*:../../security/p5-Crypt-IDEA
+DEPENDS+=		{perl>=5.7.3,p5-Digest-MD5-[0-9]*}:../../security/p5-Digest-MD5
+.endif