diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index cc094157d69..b1e742d81a6 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.79 2013/06/14 11:59:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.80 2013/06/18 13:22:39 ajacoutot Exp $
 
 COMMENT=	GNU Transport Layer Security library
 
-V=		3.1.12
+V=		3.2.1
 DISTNAME=	gnutls-${V}
-REVISION=	0
 EXTRACT_SUFX=	.tar.xz
 
 CATEGORIES=	security
 
-SHARED_LIBS +=  gnutls               39.6     # 47.1
+SHARED_LIBS +=  gnutls               39.7     # 50.0
 SHARED_LIBS +=  gnutlsxx             29.1     # 29.0
 SHARED_LIBS +=  gnutls-xssl          0.0      # 0.0
 SHARED_LIBS +=  gnutls-openssl       27.2     # 27.2
@@ -43,7 +42,6 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-gtk-doc \
 		--disable-guile \
 		--disable-valgrind-tests \
-		--disable-hardware-acceleration \
 		--with-packager="OpenBSD Ports"
 
 # add dependency on net/unbound; see post-install as well
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 7b27e586c2e..c2265153166 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnutls-3.1.12.tar.xz) = zNODzgBUA5NkUyjtt6nKEX2N5dI+IfIyZzYIqvkZswg=
-SIZE (gnutls-3.1.12.tar.xz) = 5119380
+SHA256 (gnutls-3.2.1.tar.xz) = q/qBZZR4N62iNjNVraJdkT9I5rsmHwpn8g0vtgeeIv4=
+SIZE (gnutls-3.2.1.tar.xz) = 5127332
diff --git a/security/gnutls/patches/patch-lib_gnutls_cipher_c b/security/gnutls/patches/patch-lib_gnutls_cipher_c
index fc42a9d3b39..47bab0828aa 100644
--- a/security/gnutls/patches/patch-lib_gnutls_cipher_c
+++ b/security/gnutls/patches/patch-lib_gnutls_cipher_c
@@ -1,4 +1,4 @@
-$OpenBSD: patch-lib_gnutls_cipher_c,v 1.1 2013/06/14 11:59:09 jasper Exp $
+$OpenBSD: patch-lib_gnutls_cipher_c,v 1.2 2013/06/18 13:22:39 ajacoutot Exp $
 
 Security fix for CVE-2013-2116,
 GnuTLS TLS Record Decoding Denial of Service Vulnerability
@@ -6,9 +6,9 @@ GnuTLS TLS Record Decoding Denial of Service Vulnerability
 Patch from upstream:
 http://article.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/6754
 
---- lib/gnutls_cipher.c.orig	Fri Jun 14 13:39:48 2013
-+++ lib/gnutls_cipher.c	Fri Jun 14 13:46:12 2013
-@@ -736,6 +736,8 @@ ciphertext_to_compressed (gnutls_session_t session,
+--- lib/gnutls_cipher.c.orig	Sat May 25 13:06:37 2013
++++ lib/gnutls_cipher.c	Tue Jun 18 14:50:50 2013
+@@ -762,6 +762,8 @@ ciphertext_to_compressed (gnutls_session_t session,
          return gnutls_assert_val(ret);
  
        pad = ciphertext->data[ciphertext->size - 1];   /* pad */
diff --git a/security/gnutls/pkg/PLIST b/security/gnutls/pkg/PLIST
index e76739affce..1dbd847e014 100644
--- a/security/gnutls/pkg/PLIST
+++ b/security/gnutls/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.26 2013/06/09 09:36:44 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.27 2013/06/18 13:22:39 ajacoutot Exp $
 @bin bin/certtool
 @bin bin/crywrap
 @bin bin/danetool
@@ -65,6 +65,8 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_alert_get_strname.3
 @man man/man3/gnutls_alert_send.3
 @man man/man3/gnutls_alert_send_appropriate.3
+@man man/man3/gnutls_alpn_get_selected_protocol.3
+@man man/man3/gnutls_alpn_set_protocols.3
 @man man/man3/gnutls_anon_allocate_client_credentials.3
 @man man/man3/gnutls_anon_allocate_server_credentials.3
 @man man/man3/gnutls_anon_free_client_credentials.3
@@ -142,6 +144,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_cipher_get.3
 @man man/man3/gnutls_cipher_get_block_size.3
 @man man/man3/gnutls_cipher_get_id.3
+@man man/man3/gnutls_cipher_get_iv_size.3
 @man man/man3/gnutls_cipher_get_key_size.3
 @man man/man3/gnutls_cipher_get_name.3
 @man man/man3/gnutls_cipher_init.3
@@ -236,6 +239,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_hmac_get_len.3
 @man man/man3/gnutls_hmac_init.3
 @man man/man3/gnutls_hmac_output.3
+@man man/man3/gnutls_hmac_set_nonce.3
 @man man/man3/gnutls_init.3
 @man man/man3/gnutls_key_generate.3
 @man man/man3/gnutls_kx_get.3
@@ -248,6 +252,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_mac_get_id.3
 @man man/man3/gnutls_mac_get_key_size.3
 @man man/man3/gnutls_mac_get_name.3
+@man man/man3/gnutls_mac_get_nonce_size.3
 @man man/man3/gnutls_mac_list.3
 @man man/man3/gnutls_mac_set_priority.3
 @man man/man3/gnutls_ocsp_req_add_cert.3
@@ -585,6 +590,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_session_is_resumed.3
 @man man/man3/gnutls_session_resumption_requested.3
 @man man/man3/gnutls_session_set_data.3
+@man man/man3/gnutls_session_set_id.3
 @man man/man3/gnutls_session_set_premaster.3
 @man man/man3/gnutls_session_set_ptr.3
 @man man/man3/gnutls_session_ticket_enable_client.3