Index: Makefile
===================================================================
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile	20 Oct 2015 09:20:50 -0000	1.41
+++ Makefile	2 Jul 2016 03:30:08 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.1.9
+DISTNAME =	gnupg-2.1.13
 CATEGORIES = 	security
 
 MASTER_SITES =	${MASTER_SITES_GNUPG:=gnupg/}
@@ -53,7 +53,8 @@ CONFIGURE_ENV = 	CPPFLAGS="-I${LOCALBASE
 			LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS += 	docdir=${LOCALBASE}/share/doc/gnupg2 \
 			--enable-gpgtar \
-			--with-adns=no
+			--with-adns=no  \
+			--enable-g13
 
 # Avoid conflict with gnupg-1.x
 post-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo	20 Oct 2015 09:20:50 -0000	1.18
+++ distinfo	2 Jul 2016 03:30:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.1.9.tar.bz2) = HLdjOlcZC+tm+SSct0RmAyKbJz1NiTMbdcZS+kop97Y=
-SIZE (gnupg-2.1.9.tar.bz2) = 4925167
+SHA256 (gnupg-2.1.13.tar.bz2) = 4f9d83a6221daa60130fa79f0b1d37d6c20fffdd0320b640c7a597c5b6219675
+SIZE (gnupg-2.1.13.tar.bz2) = 5545361
Index: patches/patch-doc_Makefile_am
===================================================================
RCS file: patches/patch-doc_Makefile_am
diff -N patches/patch-doc_Makefile_am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_Makefile_am	2 Jul 2016 03:30:08 -0000
@@ -0,0 +1,21 @@
+UPSTREAM:
+
+gnu-gpg2 seems to have forgotten to add doc/gpg-zip.1
+to its list of man files to be copied during the
+install phase.
+
+OpenBSD catches this in the ports Makefile for gnupg2,
+and throws an error about the missing file.
+
+$OpenBSD$
+--- doc/Makefile.am.orig	Wed May  4 03:43:16 2016
++++ doc/Makefile.am	Mon Jun 27 02:34:44 2016
+@@ -89,7 +89,7 @@ else
+ myman_pages += gpg.1 gpgv.1
+ endif
+ 
+-man_MANS = $(myman_pages) gnupg.7
++man_MANS = $(myman_pages) gpg-zip.1 gnupg.7
+ 
+ watchgnupg_SOURCE = gnupg.texi
+ 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST	20 Oct 2015 09:20:50 -0000	1.13
+++ pkg/PLIST	2 Jul 2016 03:30:08 -0000
@@ -8,7 +8,7 @@
 @bin bin/gpg-connect-agent
 @bin bin/gpg2
 @bin bin/gpgconf
-@bin bin/gpgkey2ssh
+
 @bin bin/gpgparsemail
 @bin bin/gpgsm
 @bin bin/gpgtar
@@ -24,7 +24,7 @@
 @man man/man1/gpg-agent.1
 @man man/man1/gpg-connect-agent.1
 @man man/man1/gpg-preset-passphrase.1
-@man man/man1/gpg2-zip.1
+@man man/man1/gpg-zip.1
 @man man/man1/gpg2.1
 @man man/man1/gpgconf.1
 @man man/man1/gpgparsemail.1