diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 5ed8cfc5d0a..cc02212e5a1 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.42 2011/10/03 15:32:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.43 2011/10/21 15:38:15 ajacoutot Exp $
 
 COMMENT=	GNU Transport Layer Security library
 
-DISTNAME=	gnutls-2.12.11
+DISTNAME=	gnutls-2.12.12
 CATEGORIES=	security
 
 SHARED_LIBS +=  gnutls               18.1     # 47.4
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 3abfad435b8..1ef34ff16f8 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnutls-2.12.11.tar.bz2) = 8II0tkqAJdbVqhMHhosC7Q==
-RMD160 (gnutls-2.12.11.tar.bz2) = 2IksirRKaeRdQxJf1lPCXmLR+50=
-SHA1 (gnutls-2.12.11.tar.bz2) = MMiXfD8ytI5SPgnLjOiVLYBSCk8=
-SHA256 (gnutls-2.12.11.tar.bz2) = ALWOGq/pm70Ms3Hn8d+cxYv4BzAc9wp+6+3u4JOZE2A=
-SIZE (gnutls-2.12.11.tar.bz2) = 7162654
+MD5 (gnutls-2.12.12.tar.bz2) = KewDAn8OVRMB2ngfApUxYA==
+RMD160 (gnutls-2.12.12.tar.bz2) = 0OJrVsRONj+VhxxegDWfqyAXayU=
+SHA1 (gnutls-2.12.12.tar.bz2) = bIdZFwWyH3yuhF7NrhWKbF2PKEc=
+SHA256 (gnutls-2.12.12.tar.bz2) = fP0KWLTggQy+nsHGhUtWrrmjwpdGqTg27nhLBN4TEYE=
+SIZE (gnutls-2.12.12.tar.bz2) = 7195302
diff --git a/security/gnutls/patches/patch-gl_inet_ntop_c b/security/gnutls/patches/patch-gl_inet_ntop_c
index ba9a272d6d2..c0ada70ddd5 100644
--- a/security/gnutls/patches/patch-gl_inet_ntop_c
+++ b/security/gnutls/patches/patch-gl_inet_ntop_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gl_inet_ntop_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
---- gl/inet_ntop.c.orig	Wed May  4 16:59:41 2011
-+++ gl/inet_ntop.c	Wed May  4 17:02:33 2011
+$OpenBSD: patch-gl_inet_ntop_c,v 1.2 2011/10/21 15:38:15 ajacoutot Exp $
+--- gl/inet_ntop.c.orig	Mon Oct  3 17:41:55 2011
++++ gl/inet_ntop.c	Fri Oct 21 17:21:51 2011
 @@ -36,6 +36,7 @@
  #include <config.h>
  
@@ -8,4 +8,4 @@ $OpenBSD: patch-gl_inet_ntop_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
 +#include <netinet/in.h>
  #include <arpa/inet.h>
  
- #include <stdio.h>
+ #if HAVE_DECL_INET_NTOP
diff --git a/security/gnutls/patches/patch-gl_inet_pton_c b/security/gnutls/patches/patch-gl_inet_pton_c
index 033e79981c9..75f768393ed 100644
--- a/security/gnutls/patches/patch-gl_inet_pton_c
+++ b/security/gnutls/patches/patch-gl_inet_pton_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gl_inet_pton_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
---- gl/inet_pton.c.orig	Wed May  4 16:59:41 2011
-+++ gl/inet_pton.c	Wed May  4 17:02:35 2011
+$OpenBSD: patch-gl_inet_pton_c,v 1.2 2011/10/21 15:38:15 ajacoutot Exp $
+--- gl/inet_pton.c.orig	Mon Oct  3 17:41:55 2011
++++ gl/inet_pton.c	Fri Oct 21 17:21:51 2011
 @@ -35,6 +35,7 @@
  #include <config.h>
  
@@ -8,4 +8,4 @@ $OpenBSD: patch-gl_inet_pton_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
 +#include <netinet/in.h>
  #include <arpa/inet.h>
  
- #include <c-ctype.h>
+ #if HAVE_DECL_INET_PTON
diff --git a/security/gnutls/patches/patch-lib_configure b/security/gnutls/patches/patch-lib_configure
index f2af1ac148a..393e0ae4cde 100644
--- a/security/gnutls/patches/patch-lib_configure
+++ b/security/gnutls/patches/patch-lib_configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_configure,v 1.6 2011/10/03 15:32:24 ajacoutot Exp $
---- lib/configure.orig	Sun Sep 18 20:31:32 2011
-+++ lib/configure	Mon Oct  3 17:00:27 2011
-@@ -18577,21 +18577,9 @@ else
+$OpenBSD: patch-lib_configure,v 1.7 2011/10/21 15:38:15 ajacoutot Exp $
+--- lib/configure.orig	Thu Oct 20 20:59:56 2011
++++ lib/configure	Fri Oct 21 17:21:51 2011
+@@ -18729,21 +18729,9 @@ else
    ZLIB_HAS_PKGCONFIG=n
  fi
  
@@ -23,7 +23,7 @@ $OpenBSD: patch-lib_configure,v 1.6 2011/10/03 15:32:24 ajacoutot Exp $
  # Check whether --with-p11-kit was given.
  if test "${with_p11_kit+set}" = set; then :
    withval=$with_p11_kit;
-@@ -26951,7 +26939,7 @@ fi
+@@ -27784,7 +27772,7 @@ fi
              done
            fi
            if test "X$found_dir" != "X"; then
@@ -32,7 +32,7 @@ $OpenBSD: patch-lib_configure,v 1.6 2011/10/03 15:32:24 ajacoutot Exp $
              if test "X$found_so" != "X"; then
                                                          if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                  LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_so"
-@@ -27004,7 +26992,7 @@ fi
+@@ -27837,7 +27825,7 @@ fi
                      if test "$acl_hardcode_minus_L" != no; then
                                                                                          LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_so"
                      else
@@ -41,7 +41,7 @@ $OpenBSD: patch-lib_configure,v 1.6 2011/10/03 15:32:24 ajacoutot Exp $
                      fi
                    fi
                  fi
-@@ -27013,7 +27001,7 @@ fi
+@@ -27846,7 +27834,7 @@ fi
                if test "X$found_a" != "X"; then
                                  LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_a"
                else
@@ -50,7 +50,7 @@ $OpenBSD: patch-lib_configure,v 1.6 2011/10/03 15:32:24 ajacoutot Exp $
                fi
              fi
                          additional_includedir=
-@@ -27163,8 +27151,8 @@ fi
+@@ -27996,8 +27984,8 @@ fi
                done
              fi
            else