diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 72eef24bbc0..ddbb54ce41a 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.19 2010/04/20 20:42:11 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/07/27 21:45:47 ajacoutot Exp $
 
 COMMENT=		crypto library based on code used in GnuPG
 
-DISTNAME=		libgcrypt-1.4.5
+DISTNAME=		libgcrypt-1.4.6
 CATEGORIES=		security
-SHARED_LIBS=		gcrypt	15.0 # .16.2
+SHARED_LIBS=		gcrypt	15.0 # .17.0
 
 HOMEPAGE=		http://www.gnu.org/directory/security/libgcrypt.html
 
-# GPLv2/LGPLv2
+# GPLv2/LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -21,9 +21,9 @@ MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
 		http://ftp.linux.it/pub/mirrors/gnupg/libgcrypt/
 
 MODULES=		devel/gettext
-LIB_DEPENDS=		gpg-error::security/libgpg-error
+LIB_DEPENDS=		:libgpg-error->=1.9:security/libgpg-error
 
-WANTLIB=		c
+WANTLIB=		c gpg-error
 
 USE_LIBTOOL=		Yes
 
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 8c8b8ac9e53..fd899cb12e4 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,5 +1,5 @@
-MD5 (libgcrypt-1.4.5.tar.gz) = MlKUwS57mdgt7jqL+MLCjg==
-RMD160 (libgcrypt-1.4.5.tar.gz) = TtmdZURKUl15fylkSVEqY7XWkcM=
-SHA1 (libgcrypt-1.4.5.tar.gz) = jYOmDKVfLqQLXVvJlGOQW3ody1Y=
-SHA256 (libgcrypt-1.4.5.tar.gz) = AWUpKJF61H6Rq44MFQ1i4O8ojxO3eEI2fIMhCcOveI8=
-SIZE (libgcrypt-1.4.5.tar.gz) = 1419443
+MD5 (libgcrypt-1.4.6.tar.gz) = v9RZIu77iiTVmK93NmIg1A==
+RMD160 (libgcrypt-1.4.6.tar.gz) = ynj1tIa7iRSNdf1NGuZXpT9fWfg=
+SHA1 (libgcrypt-1.4.6.tar.gz) = 2+P+4KnuqBKKHkfJc+D0MqYr+qI=
+SHA256 (libgcrypt-1.4.6.tar.gz) = mW0odGQzGMnfg1d3A0qLepI9PNC+5ZO6sXgDBfnehy0=
+SIZE (libgcrypt-1.4.6.tar.gz) = 1424076
diff --git a/security/libgcrypt/patches/patch-mpi_longlong_h b/security/libgcrypt/patches/patch-mpi_longlong_h
index 8034b8b6432..d7d25f32549 100644
--- a/security/libgcrypt/patches/patch-mpi_longlong_h
+++ b/security/libgcrypt/patches/patch-mpi_longlong_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-mpi_longlong_h,v 1.2 2006/02/06 06:43:48 sturm Exp $
---- mpi/longlong.h.orig	Wed Mar  3 09:21:49 2004
-+++ mpi/longlong.h	Sun Feb  5 09:41:09 2006
+$OpenBSD: patch-mpi_longlong_h,v 1.3 2010/07/27 21:45:47 ajacoutot Exp $
+--- mpi/longlong.h.orig	Mon Feb 22 11:04:43 2010
++++ mpi/longlong.h	Tue Jul 27 23:29:16 2010
 @@ -170,6 +170,7 @@ MA 02111-1307, USA. */
      (pl) = __m0 * __m1; 						\
    } while (0)
@@ -17,7 +17,7 @@ $OpenBSD: patch-mpi_longlong_h,v 1.2 2006/02/06 06:43:48 sturm Exp $
  #endif /* __alpha */
  
  /***************************************
-@@ -1133,7 +1135,7 @@ extern USItype __udiv_qrnnd ();
+@@ -1150,7 +1152,7 @@ typedef unsigned int UTItype __attribute__ ((mode (TI)
  	     "rJ" ((USItype)(al)),                                      \
  	     "rI" ((USItype)(bl))                                       \
  	   __CLOBBER_CC)
diff --git a/security/libgcrypt/patches/patch-src_gcrypt_h_in b/security/libgcrypt/patches/patch-src_gcrypt_h_in
index fc4d06def40..ac4e0e996a5 100644
--- a/security/libgcrypt/patches/patch-src_gcrypt_h_in
+++ b/security/libgcrypt/patches/patch-src_gcrypt_h_in
@@ -1,8 +1,10 @@
-$OpenBSD: patch-src_gcrypt_h_in,v 1.1 2009/01/07 17:56:40 grange Exp $
+$OpenBSD: patch-src_gcrypt_h_in,v 1.2 2010/07/27 21:45:47 ajacoutot Exp $
+
 gcc-3.3.5 workaround: g++ doesn't understand attributes on enums.
---- src/gcrypt.h.in.orig	Wed Jan  7 20:42:00 2009
-+++ src/gcrypt.h.in	Wed Jan  7 20:42:37 2009
-@@ -175,7 +175,7 @@ gcry_err_code_t gcry_error_from_errno (int err);
+
+--- src/gcrypt.h.in.orig	Tue Jul 13 16:01:50 2010
++++ src/gcrypt.h.in	Tue Jul 27 23:29:17 2010
+@@ -180,7 +180,7 @@ gcry_err_code_t gcry_error_from_errno (int err);
  enum gcry_thread_option
    {
      _GCRY_THREAD_OPTION_DUMMY