diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index a7a5bb4958a2..7f006004f13f 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -1,106 +1,102 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.14
+PORTVERSION=	1.4.15
 #PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	The GNU Privacy Guard
 
 USES=		charsetfix
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if ${MACHINE_CPU:Mi586}
 MACHINE_ARCH=	i586
 .endif
 CFLAGS:=	${CFLAGS:S/-pipe//g}
-MAN1=		gpg.1 gpgv.1 gpg.ru.1 gpg-zip.1
-MAN7=		gnupg.7
-INFO=		gnupg1
-DOCSDIR=	${PREFIX}/share/doc/gnupg1
+DOCSDIR=	${STAGEDIR}${PREFIX}/share/doc/gnupg1
 LATEST_LINK=	gnupg1
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	LDAP LIBICONV LIBUSB SUID_GPG NLS CURL DOCS
 OPTIONS_DEFAULT=	CURL
 LDAP_DESC=	LDAP keyserver interface
 LIBICONV_DESC=	use libiconv
 LIBUSB_DESC=	use libusb
 SUID_GPG_DESC=	install GPG with suid
 CURL_DESC=	use libcurl for the keyserver interface
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${CC} == "clang" || ${OSVERSION} >= 1000024
 CFLAGS:=	${CFLAGS:S/$/ -std=c89/}
 .if (${ARCH} == "i386")
 CFLAGS:=	${CFLAGS:S/$/ -fheinous-gnu-extensions/}
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MLIBICONV}
 USES+=		iconv
 .else
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 .endif
 
 .if ${PORT_OPTIONS:MLIBUSB}
 CONFIGURE_ARGS+=	--with-libusb=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-libusb
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 PLIST_SUB+=	WITH_LDAP=""
 CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
 #CONFIGURE_ENV+=	LDFLAGS="-L/usr/lib"
 .else
 PLIST_SUB+=	WITH_LDAP="@comment "
 CONFIGURE_ARGS+=	--disable-ldap
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
 # Work around a GnuPG configure buglet
 CONFIGURE_ENV+=	_libcurl_config=${LOCALBASE}/bin/curl-config
 .else
 CONFIGURE_ARGS+=--without-libcurl
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in DETAILS FAQ HACKING OpenPGP
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .for i in ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
 	README THANKS TODO VERSION
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 .if ${PORT_OPTIONS:MSUID_GPG}
-	${CHMOD} u+s ${PREFIX}/bin/gpg
+	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/gpg
 .endif
 
 check:
 	(cd ${WRKSRC}; ${MAKE} check)
 
 .include <bsd.port.mk>
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
index 0fa338e1dce0..008860fa5619 100644
--- a/security/gnupg1/distinfo
+++ b/security/gnupg1/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gnupg-1.4.14.tar.bz2) = f2c4cd3ed6a5fb66cb369bf8160e53127712adfe41ebf965c0f02ab71d984413
-SIZE (gnupg-1.4.14.tar.bz2) = 3687929
-SHA256 (gnupg-1.4.14.tar.bz2.sig) = b87348b77b0a9a8473a54fc6503ec1e3ea9294e1705547159bede8b86d01e161
-SIZE (gnupg-1.4.14.tar.bz2.sig) = 287
+SHA256 (gnupg-1.4.15.tar.bz2) = b6bb40a8f96dc1227b69f8e3b35f0bc4c8276923147f6069cae2f6307c62795d
+SIZE (gnupg-1.4.15.tar.bz2) = 3654415
+SHA256 (gnupg-1.4.15.tar.bz2.sig) = fc2caeb473d42659d2099c2738f571d0a8cb72fd28308c6c3f07ccaa76ec5fce
+SIZE (gnupg-1.4.15.tar.bz2.sig) = 287