diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index adacf919cb51..55c0cebe9d00 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2014/06/24 21:53:14 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2014/07/22 11:30:00 wiz Exp $
 
-DISTNAME=	gnupg-2.0.24
+DISTNAME=	gnupg-2.0.25
 PKGNAME=	${DISTNAME:S/gnupg/gnupg2/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index 780d70b2e9a4..3ee832cd5558 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2014/06/24 21:53:14 wiz Exp $
+$NetBSD: distinfo,v 1.31 2014/07/22 11:30:00 wiz Exp $
 
-SHA1 (gnupg-2.0.24.tar.bz2) = 010e027d5f622778cadc4c124013fe515ed705cf
-RMD160 (gnupg-2.0.24.tar.bz2) = 3da40c512d38262dfcd2f50c2f2ff6ce4e9ec791
-Size (gnupg-2.0.24.tar.bz2) = 4301922 bytes
+SHA1 (gnupg-2.0.25.tar.bz2) = 890d77d89f2d187382f95e83e386f2f7ba789436
+RMD160 (gnupg-2.0.25.tar.bz2) = b1987258aa0e22a077a02242c0056bdf64e33bfd
+Size (gnupg-2.0.25.tar.bz2) = 4301689 bytes
 SHA1 (patch-ai) = 4445d30150518f71f996e3b368a81523daded2e2
 SHA1 (patch-aj) = bfd21504e0d55f99df543912b1cdf2c573de2f98
 SHA1 (patch-al) = ef7c698ed102c4e27bbf707ae5d1fce4c2b5d8d4
diff --git a/security/gnupg2/options.mk b/security/gnupg2/options.mk
index 5369cbd02451..258efe621fa0 100644
--- a/security/gnupg2/options.mk
+++ b/security/gnupg2/options.mk
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.5 2011/01/20 08:54:56 adam Exp $
+# $NetBSD: options.mk,v 1.6 2014/07/22 11:30:00 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
-PKG_SUPPORTED_OPTIONS=	gpgsm
-PKG_SUGGESTED_OPTIONS=	gpgsm
+PKG_SUPPORTED_OPTIONS=	gnupg2-gpgsm
+PKG_SUGGESTED_OPTIONS=	gnupg2-gpgsm
+
+# remove after 2014Q3
+PKG_OPTIONS_LEGACY_OPTS+=     gpgsm:gnupg2-gpgsm
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"