diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index a4eb3eaaa6072..547327ad21250 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.133 2016/03/05 11:29:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.133.4.1 2016/09/13 18:23:35 bsiegert Exp $
 
-DISTNAME=	gnupg-1.4.20
-PKGREVISION=	1
+DISTNAME=	gnupg-1.4.21
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 303b2395ac41d..33840534ac310 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.69 2015/12/22 20:55:41 ryoon Exp $
+$NetBSD: distinfo,v 1.69.6.1 2016/09/13 18:23:35 bsiegert Exp $
 
-SHA1 (gnupg-1.4.20.tar.bz2) = cbc9d960e3d8488c32675019a79fbfbf8680387e
-RMD160 (gnupg-1.4.20.tar.bz2) = 1bc94104238019e557b8362eeaab298bd8b17750
-SHA512 (gnupg-1.4.20.tar.bz2) = 8a66d5a45dcf0508601452061eb1965c3c56c56f0e5ded00b7f54c6104de0a305c1d526abd37be2f55cd9bde79600d9cfaf60536af77ff733d778ace5fcd9dad
-Size (gnupg-1.4.20.tar.bz2) = 3692881 bytes
+SHA1 (gnupg-1.4.21.tar.bz2) = e3bdb585026f752ae91360f45c28e76e4a15d338
+RMD160 (gnupg-1.4.21.tar.bz2) = 082b2759497ea470093bf856d72d5430711b6db9
+SHA512 (gnupg-1.4.21.tar.bz2) = 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
+Size (gnupg-1.4.21.tar.bz2) = 3689305 bytes
 SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index d3bfcc100ab82..40c55b7adecb5 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2016/06/17 11:56:13 wiz Exp $
+# $NetBSD: Makefile,v 1.79.2.1 2016/09/13 18:23:35 bsiegert Exp $
 
-DISTNAME=	libgcrypt-1.7.1
+DISTNAME=	libgcrypt-1.7.3
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
@@ -54,9 +55,15 @@ CONFIGURE_ENV+=		gcry_cv_gcc_inline_asm_avx=no
 .  endif
 .endif
 
+SUBST_CLASSES+=		rpath
+SUBST_FILES.rpath=	src/libgcrypt-config.in
+SUBST_STAGE.rpath=	pre-configure
+SUBST_MESSAGE.rpath=	Fixing rpath flags
+SUBST_VARS.rpath=	COMPILER_RPATH_FLAG
+
 .include "options.mk"
 
-BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.11
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.13
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk
index 05bfb84fbb96d..2901fb950418c 100644
--- a/security/libgcrypt/buildlink3.mk
+++ b/security/libgcrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2014/03/14 13:39:07 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.17.20.1 2016/09/13 18:23:35 bsiegert Exp $
 
 BUILDLINK_TREE+=	libgcrypt
 
@@ -7,7 +7,7 @@ LIBGCRYPT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.2.0
 BUILDLINK_ABI_DEPENDS.libgcrypt+=	libgcrypt>=1.6.0
-BUILDLINK_PKGSRCDIR.libgcrypt?=	../../security/libgcrypt
+BUILDLINK_PKGSRCDIR.libgcrypt?=		../../security/libgcrypt
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .endif # LIBGCRYPT_BUILDLINK3_MK
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 270f5ae7fd3ba..33f068bbc1d4e 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.64 2016/06/17 11:56:13 wiz Exp $
+$NetBSD: distinfo,v 1.64.2.1 2016/09/13 18:23:35 bsiegert Exp $
 
-SHA1 (libgcrypt-1.7.1.tar.bz2) = b688add52b622bb96bbd823ba21aa05a116d442f
-RMD160 (libgcrypt-1.7.1.tar.bz2) = 1be0c84cf7bcb1ac8a185ff965e02b9182708f6f
-SHA512 (libgcrypt-1.7.1.tar.bz2) = 08ca7de8b6324d1119935b1f400b0ef55e761d42178a4daa8077d36072e5f0987ec6e7834a98c62f1a06261b1b99edc45b3041a873e284a002d8486ffc3347f5
-Size (libgcrypt-1.7.1.tar.bz2) = 2843435 bytes
-SHA1 (patch-aa) = 3dd44b8745128a6788d24f9eb00002624a5fc52b
+SHA1 (libgcrypt-1.7.3.tar.bz2) = 5a034291e7248592605db448481478e6c963aa9c
+RMD160 (libgcrypt-1.7.3.tar.bz2) = 0d3cd1f17572dfaccf098cfaea79d36d6f484418
+SHA512 (libgcrypt-1.7.3.tar.bz2) = 55c5704e45167dc5adf1e5a92789a5d841dc27966212cc556abb374e724fddcd85c74b83e0cfa5f3ed2575e3fec9465e8a90d1c5bc8ab1f6697c9abfc2dcaa05
+Size (libgcrypt-1.7.3.tar.bz2) = 2861294 bytes
+SHA1 (patch-aa) = 60b3f4453b217ed8879a2ffd8d485c0195ffb5f8
+SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
 SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518
diff --git a/security/libgcrypt/patches/patch-aa b/security/libgcrypt/patches/patch-aa
index 24e63b90d694a..1a371520e0c08 100644
--- a/security/libgcrypt/patches/patch-aa
+++ b/security/libgcrypt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2014/08/21 19:41:38 wiz Exp $
+$NetBSD: patch-aa,v 1.8.16.1 2016/09/13 18:23:35 bsiegert Exp $
 
 Add rpath to configure script.
 
@@ -9,7 +9,7 @@ Add rpath to configure script.
      # Set up `libdirs'.
      if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
 -	libdirs="-L$libdir"
-+	libdirs="-L$libdir -Wl,-R@libdir@"
++	libdirs="-L$libdir @COMPILER_RPATH_FLAG@@libdir@"
      fi
  
      # Set up `libs_final'.