diff --git a/databases/mysql-zrm/Makefile b/databases/mysql-zrm/Makefile
index 86b6e4bf5f5..fa93f6c5fd1 100644
--- a/databases/mysql-zrm/Makefile
+++ b/databases/mysql-zrm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/26 07:18:59 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/26 07:51:00 espie Exp $
 
 COMMENT =	MySQL backup scripts
 
@@ -22,7 +22,7 @@ MASTER_SITES =	http://www.zmanda.com/downloads/community/ZRM-MySQL/$V/Source/
 
 RUN_DEPENDS =	archivers/gtar \
 		databases/p5-DBD-mysql \
-		security/gnupg<2 \
+		security/gnupg \
 		textproc/p5-XML-Parser
 USE_GROFF =	Yes
 NO_BUILD =	Yes
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index 78c1fb21bd5..5c3a858b301 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/26 07:19:00 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/26 07:51:00 espie Exp $
 
 COMMENT =		simple distributed software configuration management 
 
@@ -31,7 +31,7 @@ MAKE_FLAGS =		TCC="${CC} -Wall -DFOSSIL_ENABLE_SSL"
 WANTLIB =		c crypto ssl z
 
 MODULES =		lang/tcl
-RUN_DEPENDS =		security/gnupg<2
+RUN_DEPENDS =		security/gnupg
 
 REGRESS_DEPENDS =	${MODTCL_RUN_DEPENDS}
 
diff --git a/mail/enigmail/Makefile.inc b/mail/enigmail/Makefile.inc
index 14319303dcd..b825cbfd08e 100644
--- a/mail/enigmail/Makefile.inc
+++ b/mail/enigmail/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2010/11/22 09:23:59 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2010/11/26 07:51:00 espie Exp $
 
 SHARED_ONLY =	Yes
 
@@ -17,7 +17,7 @@ MASTER_SITES =	http://www.mozilla-enigmail.org/download/source/
 
 BUILD_DEPENDS =	${MOZAPP_PKGPATH}:configure \
 		archivers/unzip
-RUN_DEPENDS =	security/gnupg<2
+RUN_DEPENDS =	security/gnupg
 LIB_DEPENDS =	${MOZAPP_PKGPATH},-main
 WANTLIB =	c m nspr4 plc4 plds4 stdc++ ${MOZAPP_DIR}/xpcom ${MOZAPP_DIR}/xpcom_core
 
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 01461dfbc8c..22f2c882140 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/11/19 07:23:06 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=	emacs interface to PGP and GnuPG
 
@@ -22,7 +22,7 @@ FLAVOR?=	gnupg
 BUILD_DEPENDS=	emacs->=21,<22:editors/emacs21
 
 .if ${FLAVOR:L:Mgnupg}
-RUN_DEPENDS=	security/gnupg<2
+RUN_DEPENDS=	security/gnupg
 .endif
 
 .if ${FLAVOR:L:Mpgp}
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 980294c3790..1871d8dbfe9 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2010/11/19 07:23:08 espie Exp $
+# $OpenBSD: Makefile,v 1.67 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=		mailfilter to identify and mark spam
 
@@ -38,7 +38,7 @@ COMMON_DEPENDS=		www/p5-HTML-Parser>=3.31 \
 
 BUILD_DEPENDS=		${COMMON_DEPENDS}
 RUN_DEPENDS=		${COMMON_DEPENDS} \
-			security/gnupg<2 \
+			security/gnupg \
 			devel/re2c
 
 MAKE_ENV+=		CC="${CC}"
diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile
index f44aea8a860..8dc5a9d8e92 100644
--- a/mail/pine-pgp-filters/Makefile
+++ b/mail/pine-pgp-filters/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2010/11/19 07:23:09 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=	simple shell based filters to use GnuPG within (Al)Pine
 
@@ -17,8 +17,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://dougbarton.us/PGP/ppf/
 
-BUILD_DEPENDS=	security/gnupg<2
-RUN_DEPENDS=	security/gnupg<2 \
+BUILD_DEPENDS=	security/gnupg
+RUN_DEPENDS=	security/gnupg \
 		mail/alpine
 
 CONFIGURE_STYLE=simple
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index ecf332a1068..eba5156b004 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/11/20 17:22:43 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=	graphical interface for GnuPG
 
@@ -27,8 +27,8 @@ WANTLIB += gpg-error m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
 WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-render-util z
 
 RUN_DEPENDS=	devel/desktop-file-utils \
-		security/gnupg<2
-BUILD_DEPENDS=	security/gnupg<2
+		security/gnupg
+BUILD_DEPENDS=	security/gnupg
 LIB_DEPENDS=	security/gpgme \
 		x11/gtk+2
 
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index e6722009813..bb5fc0d3b7d 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/11/20 17:22:43 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=		GnuPG Made Easy
 
@@ -23,7 +23,7 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--without-gpgsm
 
 MODULES=		devel/gettext
-RUN_DEPENDS=		security/gnupg<2
+RUN_DEPENDS=		security/gnupg
 BUILD_DEPENDS=		${RUN_DEPENDS}
 LIB_DEPENDS=		security/libgpg-error>=1.4
 
diff --git a/security/p5-GPG/Makefile b/security/p5-GPG/Makefile
index c56d9bc635e..c4e9fadb35a 100644
--- a/security/p5-GPG/Makefile
+++ b/security/p5-GPG/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/11/20 17:22:44 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=	perl5 interface to GnuPG using scalars
 
@@ -9,7 +9,7 @@ CATEGORIES=	security
 CPAN_AUTHOR=	MILES
 USE_GROFF =	Yes
 
-RUN_DEPENDS=	security/gnupg<2
+RUN_DEPENDS=	security/gnupg
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERMIT_PACKAGE_CDROM=	no license
diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index 02de6927557..eb122d9f9d0 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/20 17:22:44 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=	perl5 interface to GnuPG
 
@@ -16,6 +16,6 @@ PERMIT_DISTFILES_FTP=   Yes
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	devel/p5-Class-MethodMaker \
-		security/gnupg<2
+		security/gnupg
 
 .include <bsd.port.mk>	
diff --git a/security/p5-GnuPG/Makefile b/security/p5-GnuPG/Makefile
index a5c77e56ec5..f6a73a3f3cc 100644
--- a/security/p5-GnuPG/Makefile
+++ b/security/p5-GnuPG/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/20 17:22:44 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=	perl5 interface to GnuPG
 
@@ -8,7 +8,7 @@ REVISION=	1
 CATEGORIES=	security
 USE_GROFF =	Yes
 
-RUN_DEPENDS=	security/gnupg<2
+RUN_DEPENDS=	security/gnupg
 
 # GPL
 PERMIT_PACKAGE_CDROM=   Yes
diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile
index 530caca40e4..19961c50c0d 100644
--- a/security/p5-Module-Signature/Makefile
+++ b/security/p5-Module-Signature/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/11/20 17:22:44 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/26 07:51:00 espie Exp $
 
 COMMENT =		module signature file manipulation
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP =	Yes
 MODULES =		cpan
 USE_GROFF =		Yes
 BUILD_DEPENDS =		${RUN_DEPENDS}
-RUN_DEPENDS =		security/gnupg<2
+RUN_DEPENDS =		security/gnupg
 
 # Enable signature check by the module itself during make regress.
 # Thus the regression test only works on an unpatched port as it
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index 57a41e3d62d..45a7fa66840 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2010/11/20 17:22:44 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=	perl module to create/verify PGP signatures
 
@@ -21,7 +21,7 @@ FLAVOR?=
 RUN_DEPENDS=	pgp->=5,<6:security/pgp5
 CONFIGURE_ARGS=	PGPV="${LOCALBASE}/bin/pgpv" PGPS="${LOCALBASE}/bin/pgps" PGPSTYLE="PGP5"
 .else
-RUN_DEPENDS=	security/gnupg<2
+RUN_DEPENDS=	security/gnupg
 CONFIGURE_ARGS=	PGP="${LOCALBASE}/bin/gpg" PGPSTYLE="GPG"
 .endif
 
diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile
index d0c89f3a978..015b0cea25e 100644
--- a/security/py-gnupg/Makefile
+++ b/security/py-gnupg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/11/20 17:22:45 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=	Python module for GnuPG interface
 
@@ -23,7 +23,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=py-gnupg/}
 MODULES=	lang/python
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	security/gnupg<2
+RUN_DEPENDS=	security/gnupg
 
 NO_REGRESS=	Yes
 
diff --git a/www/rt/Makefile b/www/rt/Makefile
index 2a2f4e55ae7..a8492c2f904 100644
--- a/www/rt/Makefile
+++ b/www/rt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/11/22 08:36:53 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/26 07:51:00 espie Exp $
 
 COMMENT=		industrial-grade ticketing system
 
@@ -78,11 +78,11 @@ CONFIGURE_ARGS=		--with-rt-group=bin \
 			--enable-graphviz \
 			--enable-gd
 
-RUN_DEPENDS+=		security/gnupg<2 \
+RUN_DEPENDS+=		security/gnupg \
 			graphics/gd \
 			math/graphviz,-main
 
-BUILD_DEPENDS+=		security/gnupg<2 \
+BUILD_DEPENDS+=		security/gnupg \
 			graphics/gd \
 			math/graphviz,-main