diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 4d7fd985bbddf..235c51be6bb4a 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.126 2013/05/31 12:41:51 wiz Exp $
+# $NetBSD: Makefile,v 1.127 2013/07/08 08:30:01 wiz Exp $
 
-DISTNAME=	gnutls-3.0.29
-PKGREVISION=	1
+DISTNAME=	gnutls-3.2.1
 CATEGORIES=	security devel
-MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.0/
+MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -50,6 +49,7 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libcfg+/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.3.4
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../security/nettle/buildlink3.mk"
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index f29858a9dc5c5..a8558f5da0539 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.43 2012/10/10 11:44:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.44 2013/07/08 08:30:01 wiz Exp $
 bin/certtool
+bin/danetool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
@@ -16,7 +17,9 @@ include/gnutls/ocsp.h
 include/gnutls/openpgp.h
 include/gnutls/pkcs11.h
 include/gnutls/pkcs12.h
+include/gnutls/tpm.h
 include/gnutls/x509.h
+include/gnutls/xssl.h
 info/gnutls-client-server-use-case.png
 info/gnutls-guile.info
 info/gnutls-handshake-sequence.png
@@ -29,6 +32,7 @@ info/gnutls-pgp.png
 info/gnutls-x509.png
 info/gnutls.info
 info/pkcs11-vision.png
+lib/libgnutls-xssl.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
 lib/pkgconfig/gnutls.pc
@@ -40,11 +44,14 @@ man/man1/ocsptool.1
 man/man1/p11tool.1
 man/man1/psktool.1
 man/man1/srptool.1
+man/man1/tpmtool.1
 man/man3/gnutls_alert_get.3
 man/man3/gnutls_alert_get_name.3
 man/man3/gnutls_alert_get_strname.3
 man/man3/gnutls_alert_send.3
 man/man3/gnutls_alert_send_appropriate.3
+man/man3/gnutls_alpn_get_selected_protocol.3
+man/man3/gnutls_alpn_set_protocols.3
 man/man3/gnutls_anon_allocate_client_credentials.3
 man/man3/gnutls_anon_allocate_server_credentials.3
 man/man3/gnutls_anon_free_client_credentials.3
@@ -68,10 +75,13 @@ man/man3/gnutls_certificate_free_keys.3
 man/man3/gnutls_certificate_get_issuer.3
 man/man3/gnutls_certificate_get_ours.3
 man/man3/gnutls_certificate_get_peers.3
+man/man3/gnutls_certificate_get_peers_subkey_id.3
 man/man3/gnutls_certificate_send_x509_rdn_sequence.3
 man/man3/gnutls_certificate_server_set_request.3
 man/man3/gnutls_certificate_set_dh_params.3
 man/man3/gnutls_certificate_set_key.3
+man/man3/gnutls_certificate_set_ocsp_status_request_file.3
+man/man3/gnutls_certificate_set_ocsp_status_request_function.3
 man/man3/gnutls_certificate_set_openpgp_key.3
 man/man3/gnutls_certificate_set_openpgp_key_file.3
 man/man3/gnutls_certificate_set_openpgp_key_file2.3
@@ -80,6 +90,7 @@ man/man3/gnutls_certificate_set_openpgp_key_mem2.3
 man/man3/gnutls_certificate_set_openpgp_keyring_file.3
 man/man3/gnutls_certificate_set_openpgp_keyring_mem.3
 man/man3/gnutls_certificate_set_params_function.3
+man/man3/gnutls_certificate_set_pin_function.3
 man/man3/gnutls_certificate_set_retrieve_function.3
 man/man3/gnutls_certificate_set_retrieve_function2.3
 man/man3/gnutls_certificate_set_rsa_export_params.3
@@ -91,7 +102,9 @@ man/man3/gnutls_certificate_set_x509_crl_file.3
 man/man3/gnutls_certificate_set_x509_crl_mem.3
 man/man3/gnutls_certificate_set_x509_key.3
 man/man3/gnutls_certificate_set_x509_key_file.3
+man/man3/gnutls_certificate_set_x509_key_file2.3
 man/man3/gnutls_certificate_set_x509_key_mem.3
+man/man3/gnutls_certificate_set_x509_key_mem2.3
 man/man3/gnutls_certificate_set_x509_simple_pkcs12_file.3
 man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem.3
 man/man3/gnutls_certificate_set_x509_system_trust.3
@@ -103,7 +116,9 @@ man/man3/gnutls_certificate_type_get_id.3
 man/man3/gnutls_certificate_type_get_name.3
 man/man3/gnutls_certificate_type_list.3
 man/man3/gnutls_certificate_type_set_priority.3
+man/man3/gnutls_certificate_verification_status_print.3
 man/man3/gnutls_certificate_verify_peers2.3
+man/man3/gnutls_certificate_verify_peers3.3
 man/man3/gnutls_check_version.3
 man/man3/gnutls_cipher_add_auth.3
 man/man3/gnutls_cipher_decrypt.3
@@ -114,6 +129,7 @@ man/man3/gnutls_cipher_encrypt2.3
 man/man3/gnutls_cipher_get.3
 man/man3/gnutls_cipher_get_block_size.3
 man/man3/gnutls_cipher_get_id.3
+man/man3/gnutls_cipher_get_iv_size.3
 man/man3/gnutls_cipher_get_key_size.3
 man/man3/gnutls_cipher_get_name.3
 man/man3/gnutls_cipher_init.3
@@ -131,6 +147,7 @@ man/man3/gnutls_compression_set_priority.3
 man/man3/gnutls_credentials_clear.3
 man/man3/gnutls_credentials_set.3
 man/man3/gnutls_db_check_entry.3
+man/man3/gnutls_db_check_entry_time.3
 man/man3/gnutls_db_get_ptr.3
 man/man3/gnutls_db_remove_session.3
 man/man3/gnutls_db_set_cache_expiration.3
@@ -146,6 +163,7 @@ man/man3/gnutls_dh_get_pubkey.3
 man/man3/gnutls_dh_get_secret_bits.3
 man/man3/gnutls_dh_params_cpy.3
 man/man3/gnutls_dh_params_deinit.3
+man/man3/gnutls_dh_params_export2_pkcs3.3
 man/man3/gnutls_dh_params_export_pkcs3.3
 man/man3/gnutls_dh_params_export_raw.3
 man/man3/gnutls_dh_params_generate2.3
@@ -183,12 +201,20 @@ man/man3/gnutls_handshake_get_last_out.3
 man/man3/gnutls_handshake_set_max_packet_length.3
 man/man3/gnutls_handshake_set_post_client_hello_function.3
 man/man3/gnutls_handshake_set_private_extensions.3
+man/man3/gnutls_handshake_set_random.3
+man/man3/gnutls_handshake_set_timeout.3
 man/man3/gnutls_hash.3
 man/man3/gnutls_hash_deinit.3
 man/man3/gnutls_hash_fast.3
 man/man3/gnutls_hash_get_len.3
 man/man3/gnutls_hash_init.3
 man/man3/gnutls_hash_output.3
+man/man3/gnutls_heartbeat_allowed.3
+man/man3/gnutls_heartbeat_enable.3
+man/man3/gnutls_heartbeat_get_timeout.3
+man/man3/gnutls_heartbeat_ping.3
+man/man3/gnutls_heartbeat_pong.3
+man/man3/gnutls_heartbeat_set_timeouts.3
 man/man3/gnutls_hex2bin.3
 man/man3/gnutls_hex_decode.3
 man/man3/gnutls_hex_encode.3
@@ -198,6 +224,7 @@ man/man3/gnutls_hmac_fast.3
 man/man3/gnutls_hmac_get_len.3
 man/man3/gnutls_hmac_init.3
 man/man3/gnutls_hmac_output.3
+man/man3/gnutls_hmac_set_nonce.3
 man/man3/gnutls_init.3
 man/man3/gnutls_key_generate.3
 man/man3/gnutls_kx_get.3
@@ -205,10 +232,12 @@ man/man3/gnutls_kx_get_id.3
 man/man3/gnutls_kx_get_name.3
 man/man3/gnutls_kx_list.3
 man/man3/gnutls_kx_set_priority.3
+man/man3/gnutls_load_file.3
 man/man3/gnutls_mac_get.3
 man/man3/gnutls_mac_get_id.3
 man/man3/gnutls_mac_get_key_size.3
 man/man3/gnutls_mac_get_name.3
+man/man3/gnutls_mac_get_nonce_size.3
 man/man3/gnutls_mac_list.3
 man/man3/gnutls_mac_set_priority.3
 man/man3/gnutls_ocsp_req_add_cert.3
@@ -225,6 +254,7 @@ man/man3/gnutls_ocsp_req_print.3
 man/man3/gnutls_ocsp_req_randomize_nonce.3
 man/man3/gnutls_ocsp_req_set_extension.3
 man/man3/gnutls_ocsp_req_set_nonce.3
+man/man3/gnutls_ocsp_resp_check_crt.3
 man/man3/gnutls_ocsp_resp_deinit.3
 man/man3/gnutls_ocsp_resp_export.3
 man/man3/gnutls_ocsp_resp_get_certs.3
@@ -243,9 +273,13 @@ man/man3/gnutls_ocsp_resp_init.3
 man/man3/gnutls_ocsp_resp_print.3
 man/man3/gnutls_ocsp_resp_verify.3
 man/man3/gnutls_ocsp_resp_verify_direct.3
+man/man3/gnutls_ocsp_status_request_enable_client.3
+man/man3/gnutls_ocsp_status_request_get.3
+man/man3/gnutls_ocsp_status_request_is_checked.3
 man/man3/gnutls_openpgp_crt_check_hostname.3
 man/man3/gnutls_openpgp_crt_deinit.3
 man/man3/gnutls_openpgp_crt_export.3
+man/man3/gnutls_openpgp_crt_export2.3
 man/man3/gnutls_openpgp_crt_get_auth_subkey.3
 man/man3/gnutls_openpgp_crt_get_creation_time.3
 man/man3/gnutls_openpgp_crt_get_expiration_time.3
@@ -284,6 +318,7 @@ man/man3/gnutls_openpgp_keyring_import.3
 man/man3/gnutls_openpgp_keyring_init.3
 man/man3/gnutls_openpgp_privkey_deinit.3
 man/man3/gnutls_openpgp_privkey_export.3
+man/man3/gnutls_openpgp_privkey_export2.3
 man/man3/gnutls_openpgp_privkey_export_dsa_raw.3
 man/man3/gnutls_openpgp_privkey_export_rsa_raw.3
 man/man3/gnutls_openpgp_privkey_export_subkey_dsa_raw.3
@@ -330,22 +365,29 @@ man/man3/gnutls_pkcs11_copy_x509_crt.3
 man/man3/gnutls_pkcs11_copy_x509_privkey.3
 man/man3/gnutls_pkcs11_deinit.3
 man/man3/gnutls_pkcs11_delete_url.3
+man/man3/gnutls_pkcs11_get_pin_function.3
 man/man3/gnutls_pkcs11_init.3
 man/man3/gnutls_pkcs11_obj_deinit.3
 man/man3/gnutls_pkcs11_obj_export.3
+man/man3/gnutls_pkcs11_obj_export2.3
 man/man3/gnutls_pkcs11_obj_export_url.3
 man/man3/gnutls_pkcs11_obj_get_info.3
 man/man3/gnutls_pkcs11_obj_get_type.3
 man/man3/gnutls_pkcs11_obj_import_url.3
 man/man3/gnutls_pkcs11_obj_init.3
 man/man3/gnutls_pkcs11_obj_list_import_url.3
+man/man3/gnutls_pkcs11_obj_list_import_url2.3
+man/man3/gnutls_pkcs11_obj_set_pin_function.3
 man/man3/gnutls_pkcs11_privkey_deinit.3
 man/man3/gnutls_pkcs11_privkey_export_url.3
 man/man3/gnutls_pkcs11_privkey_generate.3
+man/man3/gnutls_pkcs11_privkey_generate2.3
 man/man3/gnutls_pkcs11_privkey_get_info.3
 man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3
 man/man3/gnutls_pkcs11_privkey_import_url.3
 man/man3/gnutls_pkcs11_privkey_init.3
+man/man3/gnutls_pkcs11_privkey_set_pin_function.3
+man/man3/gnutls_pkcs11_privkey_status.3
 man/man3/gnutls_pkcs11_reinit.3
 man/man3/gnutls_pkcs11_set_pin_function.3
 man/man3/gnutls_pkcs11_set_token_function.3
@@ -372,16 +414,19 @@ man/man3/gnutls_pkcs12_bag_set_friendly_name.3
 man/man3/gnutls_pkcs12_bag_set_key_id.3
 man/man3/gnutls_pkcs12_deinit.3
 man/man3/gnutls_pkcs12_export.3
+man/man3/gnutls_pkcs12_export2.3
 man/man3/gnutls_pkcs12_generate_mac.3
 man/man3/gnutls_pkcs12_get_bag.3
 man/man3/gnutls_pkcs12_import.3
 man/man3/gnutls_pkcs12_init.3
 man/man3/gnutls_pkcs12_set_bag.3
+man/man3/gnutls_pkcs12_simple_parse.3
 man/man3/gnutls_pkcs12_verify_mac.3
 man/man3/gnutls_pkcs7_deinit.3
 man/man3/gnutls_pkcs7_delete_crl.3
 man/man3/gnutls_pkcs7_delete_crt.3
 man/man3/gnutls_pkcs7_export.3
+man/man3/gnutls_pkcs7_export2.3
 man/man3/gnutls_pkcs7_get_crl_count.3
 man/man3/gnutls_pkcs7_get_crl_raw.3
 man/man3/gnutls_pkcs7_get_crt_count.3
@@ -409,12 +454,22 @@ man/man3/gnutls_privkey_deinit.3
 man/man3/gnutls_privkey_get_pk_algorithm.3
 man/man3/gnutls_privkey_get_type.3
 man/man3/gnutls_privkey_import_ext.3
+man/man3/gnutls_privkey_import_ext2.3
 man/man3/gnutls_privkey_import_openpgp.3
+man/man3/gnutls_privkey_import_openpgp_raw.3
 man/man3/gnutls_privkey_import_pkcs11.3
+man/man3/gnutls_privkey_import_pkcs11_url.3
+man/man3/gnutls_privkey_import_tpm_raw.3
+man/man3/gnutls_privkey_import_tpm_url.3
+man/man3/gnutls_privkey_import_url.3
 man/man3/gnutls_privkey_import_x509.3
+man/man3/gnutls_privkey_import_x509_raw.3
 man/man3/gnutls_privkey_init.3
+man/man3/gnutls_privkey_set_pin_function.3
 man/man3/gnutls_privkey_sign_data.3
 man/man3/gnutls_privkey_sign_hash.3
+man/man3/gnutls_privkey_sign_raw_data.3
+man/man3/gnutls_privkey_status.3
 man/man3/gnutls_protocol_get_id.3
 man/man3/gnutls_protocol_get_name.3
 man/man3/gnutls_protocol_get_version.3
@@ -437,6 +492,7 @@ man/man3/gnutls_psk_set_server_params_function.3
 man/man3/gnutls_pubkey_deinit.3
 man/man3/gnutls_pubkey_encrypt_data.3
 man/man3/gnutls_pubkey_export.3
+man/man3/gnutls_pubkey_export2.3
 man/man3/gnutls_pubkey_get_key_id.3
 man/man3/gnutls_pubkey_get_key_usage.3
 man/man3/gnutls_pubkey_get_openpgp_key_id.3
@@ -452,19 +508,30 @@ man/man3/gnutls_pubkey_import_dsa_raw.3
 man/man3/gnutls_pubkey_import_ecc_raw.3
 man/man3/gnutls_pubkey_import_ecc_x962.3
 man/man3/gnutls_pubkey_import_openpgp.3
+man/man3/gnutls_pubkey_import_openpgp_raw.3
 man/man3/gnutls_pubkey_import_pkcs11.3
 man/man3/gnutls_pubkey_import_pkcs11_url.3
 man/man3/gnutls_pubkey_import_privkey.3
 man/man3/gnutls_pubkey_import_rsa_raw.3
+man/man3/gnutls_pubkey_import_tpm_raw.3
+man/man3/gnutls_pubkey_import_tpm_url.3
+man/man3/gnutls_pubkey_import_url.3
 man/man3/gnutls_pubkey_import_x509.3
+man/man3/gnutls_pubkey_import_x509_crq.3
+man/man3/gnutls_pubkey_import_x509_raw.3
 man/man3/gnutls_pubkey_init.3
+man/man3/gnutls_pubkey_print.3
 man/man3/gnutls_pubkey_set_key_usage.3
+man/man3/gnutls_pubkey_set_pin_function.3
 man/man3/gnutls_pubkey_verify_data.3
 man/man3/gnutls_pubkey_verify_data2.3
 man/man3/gnutls_pubkey_verify_hash.3
 man/man3/gnutls_pubkey_verify_hash2.3
 man/man3/gnutls_random_art.3
+man/man3/gnutls_range_split.3
+man/man3/gnutls_record_can_use_length_hiding.3
 man/man3/gnutls_record_check_pending.3
+man/man3/gnutls_record_cork.3
 man/man3/gnutls_record_disable_padding.3
 man/man3/gnutls_record_get_direction.3
 man/man3/gnutls_record_get_discarded.3
@@ -472,9 +539,14 @@ man/man3/gnutls_record_get_max_size.3
 man/man3/gnutls_record_recv.3
 man/man3/gnutls_record_recv_seq.3
 man/man3/gnutls_record_send.3
+man/man3/gnutls_record_send_range.3
+man/man3/gnutls_record_set_max_empty_records.3
 man/man3/gnutls_record_set_max_size.3
+man/man3/gnutls_record_set_timeout.3
+man/man3/gnutls_record_uncork.3
 man/man3/gnutls_rehandshake.3
 man/man3/gnutls_rnd.3
+man/man3/gnutls_rnd_refresh.3
 man/man3/gnutls_rsa_export_get_modulus_bits.3
 man/man3/gnutls_rsa_export_get_pubkey.3
 man/man3/gnutls_rsa_params_cpy.3
@@ -492,14 +564,18 @@ man/man3/gnutls_server_name_get.3
 man/man3/gnutls_server_name_set.3
 man/man3/gnutls_session_channel_binding.3
 man/man3/gnutls_session_enable_compatibility_mode.3
+man/man3/gnutls_session_force_valid.3
 man/man3/gnutls_session_get_data.3
 man/man3/gnutls_session_get_data2.3
+man/man3/gnutls_session_get_desc.3
 man/man3/gnutls_session_get_id.3
+man/man3/gnutls_session_get_id2.3
 man/man3/gnutls_session_get_ptr.3
 man/man3/gnutls_session_get_random.3
 man/man3/gnutls_session_is_resumed.3
 man/man3/gnutls_session_resumption_requested.3
 man/man3/gnutls_session_set_data.3
+man/man3/gnutls_session_set_id.3
 man/man3/gnutls_session_set_premaster.3
 man/man3/gnutls_session_set_ptr.3
 man/man3/gnutls_session_ticket_enable_client.3
@@ -507,11 +583,16 @@ man/man3/gnutls_session_ticket_enable_server.3
 man/man3/gnutls_session_ticket_key_generate.3
 man/man3/gnutls_set_default_export_priority.3
 man/man3/gnutls_set_default_priority.3
+man/man3/gnutls_sign_algorithm_get.3
+man/man3/gnutls_sign_algorithm_get_client.3
 man/man3/gnutls_sign_algorithm_get_requested.3
 man/man3/gnutls_sign_callback_get.3
 man/man3/gnutls_sign_callback_set.3
+man/man3/gnutls_sign_get_hash_algorithm.3
 man/man3/gnutls_sign_get_id.3
 man/man3/gnutls_sign_get_name.3
+man/man3/gnutls_sign_get_pk_algorithm.3
+man/man3/gnutls_sign_is_secure.3
 man/man3/gnutls_sign_list.3
 man/man3/gnutls_srp_allocate_client_credentials.3
 man/man3/gnutls_srp_allocate_server_credentials.3
@@ -528,6 +609,14 @@ man/man3/gnutls_srp_set_prime_bits.3
 man/man3/gnutls_srp_set_server_credentials_file.3
 man/man3/gnutls_srp_set_server_credentials_function.3
 man/man3/gnutls_srp_verifier.3
+man/man3/gnutls_srtp_get_keys.3
+man/man3/gnutls_srtp_get_mki.3
+man/man3/gnutls_srtp_get_profile_id.3
+man/man3/gnutls_srtp_get_profile_name.3
+man/man3/gnutls_srtp_get_selected_profile.3
+man/man3/gnutls_srtp_set_mki.3
+man/man3/gnutls_srtp_set_profile.3
+man/man3/gnutls_srtp_set_profile_direct.3
 man/man3/gnutls_store_commitment.3
 man/man3/gnutls_store_pubkey.3
 man/man3/gnutls_strerror.3
@@ -538,20 +627,31 @@ man/man3/gnutls_tdb_init.3
 man/man3/gnutls_tdb_set_store_commitment_func.3
 man/man3/gnutls_tdb_set_store_func.3
 man/man3/gnutls_tdb_set_verify_func.3
+man/man3/gnutls_tpm_get_registered.3
+man/man3/gnutls_tpm_key_list_deinit.3
+man/man3/gnutls_tpm_key_list_get_url.3
+man/man3/gnutls_tpm_privkey_delete.3
+man/man3/gnutls_tpm_privkey_generate.3
+man/man3/gnutls_transport_get_int.3
+man/man3/gnutls_transport_get_int2.3
 man/man3/gnutls_transport_get_ptr.3
 man/man3/gnutls_transport_get_ptr2.3
 man/man3/gnutls_transport_set_errno.3
 man/man3/gnutls_transport_set_errno_function.3
+man/man3/gnutls_transport_set_int.3
+man/man3/gnutls_transport_set_int2.3
 man/man3/gnutls_transport_set_ptr.3
 man/man3/gnutls_transport_set_ptr2.3
 man/man3/gnutls_transport_set_pull_function.3
 man/man3/gnutls_transport_set_pull_timeout_function.3
 man/man3/gnutls_transport_set_push_function.3
 man/man3/gnutls_transport_set_vec_push_function.3
+man/man3/gnutls_url_is_supported.3
 man/man3/gnutls_verify_stored_pubkey.3
 man/man3/gnutls_x509_crl_check_issuer.3
 man/man3/gnutls_x509_crl_deinit.3
 man/man3/gnutls_x509_crl_export.3
+man/man3/gnutls_x509_crl_export2.3
 man/man3/gnutls_x509_crl_get_authority_key_gn_serial.3
 man/man3/gnutls_x509_crl_get_authority_key_id.3
 man/man3/gnutls_x509_crl_get_crt_count.3
@@ -561,6 +661,7 @@ man/man3/gnutls_x509_crl_get_extension_data.3
 man/man3/gnutls_x509_crl_get_extension_info.3
 man/man3/gnutls_x509_crl_get_extension_oid.3
 man/man3/gnutls_x509_crl_get_issuer_dn.3
+man/man3/gnutls_x509_crl_get_issuer_dn2.3
 man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crl_get_next_update.3
 man/man3/gnutls_x509_crl_get_number.3
@@ -587,12 +688,14 @@ man/man3/gnutls_x509_crl_sign2.3
 man/man3/gnutls_x509_crl_verify.3
 man/man3/gnutls_x509_crq_deinit.3
 man/man3/gnutls_x509_crq_export.3
+man/man3/gnutls_x509_crq_export2.3
 man/man3/gnutls_x509_crq_get_attribute_by_oid.3
 man/man3/gnutls_x509_crq_get_attribute_data.3
 man/man3/gnutls_x509_crq_get_attribute_info.3
 man/man3/gnutls_x509_crq_get_basic_constraints.3
 man/man3/gnutls_x509_crq_get_challenge_password.3
 man/man3/gnutls_x509_crq_get_dn.3
+man/man3/gnutls_x509_crq_get_dn2.3
 man/man3/gnutls_x509_crq_get_dn_by_oid.3
 man/man3/gnutls_x509_crq_get_dn_oid.3
 man/man3/gnutls_x509_crq_get_extension_by_oid.3
@@ -614,6 +717,7 @@ man/man3/gnutls_x509_crq_privkey_sign.3
 man/man3/gnutls_x509_crq_set_attribute_by_oid.3
 man/man3/gnutls_x509_crq_set_basic_constraints.3
 man/man3/gnutls_x509_crq_set_challenge_password.3
+man/man3/gnutls_x509_crq_set_dn.3
 man/man3/gnutls_x509_crq_set_dn_by_oid.3
 man/man3/gnutls_x509_crq_set_key.3
 man/man3/gnutls_x509_crq_set_key_purpose_oid.3
@@ -632,6 +736,7 @@ man/man3/gnutls_x509_crt_check_revocation.3
 man/man3/gnutls_x509_crt_cpy_crl_dist_points.3
 man/man3/gnutls_x509_crt_deinit.3
 man/man3/gnutls_x509_crt_export.3
+man/man3/gnutls_x509_crt_export2.3
 man/man3/gnutls_x509_crt_get_activation_time.3
 man/man3/gnutls_x509_crt_get_authority_info_access.3
 man/man3/gnutls_x509_crt_get_authority_key_gn_serial.3
@@ -640,6 +745,7 @@ man/man3/gnutls_x509_crt_get_basic_constraints.3
 man/man3/gnutls_x509_crt_get_ca_status.3
 man/man3/gnutls_x509_crt_get_crl_dist_points.3
 man/man3/gnutls_x509_crt_get_dn.3
+man/man3/gnutls_x509_crt_get_dn2.3
 man/man3/gnutls_x509_crt_get_dn_by_oid.3
 man/man3/gnutls_x509_crt_get_dn_oid.3
 man/man3/gnutls_x509_crt_get_expiration_time.3
@@ -653,6 +759,7 @@ man/man3/gnutls_x509_crt_get_issuer_alt_name.3
 man/man3/gnutls_x509_crt_get_issuer_alt_name2.3
 man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3
 man/man3/gnutls_x509_crt_get_issuer_dn.3
+man/man3/gnutls_x509_crt_get_issuer_dn2.3
 man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crt_get_issuer_dn_oid.3
 man/man3/gnutls_x509_crt_get_issuer_unique_id.3
@@ -662,6 +769,7 @@ man/man3/gnutls_x509_crt_get_key_usage.3
 man/man3/gnutls_x509_crt_get_pk_algorithm.3
 man/man3/gnutls_x509_crt_get_pk_dsa_raw.3
 man/man3/gnutls_x509_crt_get_pk_rsa_raw.3
+man/man3/gnutls_x509_crt_get_policy.3
 man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3
 man/man3/gnutls_x509_crt_get_private_key_usage_period.3
 man/man3/gnutls_x509_crt_get_proxy.3
@@ -697,13 +805,17 @@ man/man3/gnutls_x509_crt_set_crl_dist_points.3
 man/man3/gnutls_x509_crt_set_crl_dist_points2.3
 man/man3/gnutls_x509_crt_set_crq.3
 man/man3/gnutls_x509_crt_set_crq_extensions.3
+man/man3/gnutls_x509_crt_set_dn.3
 man/man3/gnutls_x509_crt_set_dn_by_oid.3
 man/man3/gnutls_x509_crt_set_expiration_time.3
 man/man3/gnutls_x509_crt_set_extension_by_oid.3
+man/man3/gnutls_x509_crt_set_issuer_dn.3
 man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crt_set_key.3
 man/man3/gnutls_x509_crt_set_key_purpose_oid.3
 man/man3/gnutls_x509_crt_set_key_usage.3
+man/man3/gnutls_x509_crt_set_pin_function.3
+man/man3/gnutls_x509_crt_set_policy.3
 man/man3/gnutls_x509_crt_set_private_key_usage_period.3
 man/man3/gnutls_x509_crt_set_proxy.3
 man/man3/gnutls_x509_crt_set_proxy_dn.3
@@ -720,14 +832,18 @@ man/man3/gnutls_x509_crt_verify_data.3
 man/man3/gnutls_x509_crt_verify_hash.3
 man/man3/gnutls_x509_dn_deinit.3
 man/man3/gnutls_x509_dn_export.3
+man/man3/gnutls_x509_dn_export2.3
 man/man3/gnutls_x509_dn_get_rdn_ava.3
 man/man3/gnutls_x509_dn_import.3
 man/man3/gnutls_x509_dn_init.3
 man/man3/gnutls_x509_dn_oid_known.3
 man/man3/gnutls_x509_dn_oid_name.3
+man/man3/gnutls_x509_policy_release.3
 man/man3/gnutls_x509_privkey_cpy.3
 man/man3/gnutls_x509_privkey_deinit.3
 man/man3/gnutls_x509_privkey_export.3
+man/man3/gnutls_x509_privkey_export2.3
+man/man3/gnutls_x509_privkey_export2_pkcs8.3
 man/man3/gnutls_x509_privkey_export_dsa_raw.3
 man/man3/gnutls_x509_privkey_export_ecc_raw.3
 man/man3/gnutls_x509_privkey_export_pkcs8.3
@@ -737,9 +853,12 @@ man/man3/gnutls_x509_privkey_fix.3
 man/man3/gnutls_x509_privkey_generate.3
 man/man3/gnutls_x509_privkey_get_key_id.3
 man/man3/gnutls_x509_privkey_get_pk_algorithm.3
+man/man3/gnutls_x509_privkey_get_pk_algorithm2.3
 man/man3/gnutls_x509_privkey_import.3
+man/man3/gnutls_x509_privkey_import2.3
 man/man3/gnutls_x509_privkey_import_dsa_raw.3
 man/man3/gnutls_x509_privkey_import_ecc_raw.3
+man/man3/gnutls_x509_privkey_import_openssl.3
 man/man3/gnutls_x509_privkey_import_pkcs8.3
 man/man3/gnutls_x509_privkey_import_rsa_raw.3
 man/man3/gnutls_x509_privkey_import_rsa_raw2.3
@@ -754,9 +873,15 @@ man/man3/gnutls_x509_rdn_get_oid.3
 man/man3/gnutls_x509_trust_list_add_cas.3
 man/man3/gnutls_x509_trust_list_add_crls.3
 man/man3/gnutls_x509_trust_list_add_named_crt.3
+man/man3/gnutls_x509_trust_list_add_system_trust.3
+man/man3/gnutls_x509_trust_list_add_trust_file.3
+man/man3/gnutls_x509_trust_list_add_trust_mem.3
 man/man3/gnutls_x509_trust_list_deinit.3
 man/man3/gnutls_x509_trust_list_get_issuer.3
 man/man3/gnutls_x509_trust_list_init.3
+man/man3/gnutls_x509_trust_list_remove_cas.3
+man/man3/gnutls_x509_trust_list_remove_trust_file.3
+man/man3/gnutls_x509_trust_list_remove_trust_mem.3
 man/man3/gnutls_x509_trust_list_verify_crt.3
 man/man3/gnutls_x509_trust_list_verify_named_crt.3
 share/examples/gnutls/ex-alert.c
@@ -768,6 +893,8 @@ share/examples/gnutls/ex-client-psk.c
 share/examples/gnutls/ex-client-resume.c
 share/examples/gnutls/ex-client-srp.c
 share/examples/gnutls/ex-client-x509.c
+share/examples/gnutls/ex-client-xssl1.c
+share/examples/gnutls/ex-client-xssl2.c
 share/examples/gnutls/ex-crq.c
 share/examples/gnutls/ex-ocsp-client.c
 share/examples/gnutls/ex-pkcs11-list.c
@@ -790,6 +917,7 @@ share/locale/cs/LC_MESSAGES/gnutls.mo
 share/locale/de/LC_MESSAGES/gnutls.mo
 share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
 share/locale/en@quot/LC_MESSAGES/gnutls.mo
+share/locale/eo/LC_MESSAGES/gnutls.mo
 share/locale/fi/LC_MESSAGES/gnutls.mo
 share/locale/fr/LC_MESSAGES/gnutls.mo
 share/locale/it/LC_MESSAGES/gnutls.mo
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index fd832d7907299..1766d88f917a1 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.93 2013/04/10 15:09:10 drochner Exp $
+$NetBSD: distinfo,v 1.94 2013/07/08 08:30:01 wiz Exp $
 
-SHA1 (gnutls-3.0.29.tar.xz) = d2baf351012f8ccff8e446b2d0bd12839872012a
-RMD160 (gnutls-3.0.29.tar.xz) = 5fca1e257c43be9965deda35293451c202718325
-Size (gnutls-3.0.29.tar.xz) = 4666764 bytes
+SHA1 (gnutls-3.2.1.tar.xz) = 477118eaffb8f16bd7fd511069c2c5d618f6e400
+RMD160 (gnutls-3.2.1.tar.xz) = 1a94b39f2209b9226035f4d90a88a16d3d17898b
+Size (gnutls-3.2.1.tar.xz) = 5127332 bytes
 SHA1 (patch-ae) = 71fbbeb43ac1689fca6fec7f8348d8534c1dc38a
 SHA1 (patch-gl_stdio.in.h) = b5802da2cccddd6fab73bd39c49f7d62bef58464
+SHA1 (patch-lib_Makefile.in) = e97a6229381c31be6486a6671a0b34a7b72af981
 SHA1 (patch-lib_nettle_egd.c) = b7e9769e8c620519c43ca7b7481a558e9d389c68
+SHA1 (patch-src_benchmark.h) = d1e6801b4b76cfb299be126185616bedf658660a
diff --git a/security/gnutls/patches/patch-lib_Makefile.in b/security/gnutls/patches/patch-lib_Makefile.in
new file mode 100644
index 0000000000000..3dd3b9bf5fb51
--- /dev/null
+++ b/security/gnutls/patches/patch-lib_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_Makefile.in,v 1.1 2013/07/08 08:30:01 wiz Exp $
+
+--- lib/Makefile.in.orig	2013-07-07 13:37:03.000000000 +0000
++++ lib/Makefile.in
+@@ -350,7 +350,7 @@ am_libgnutls_la_OBJECTS = $(am__objects_
+ libgnutls_la_OBJECTS = $(am_libgnutls_la_OBJECTS)
+ libgnutls_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(libgnutls_la_LDFLAGS) $(LDFLAGS) -o $@
++	$(libgnutls_la_LDFLAGS) $(LDFLAGS) -lgmp -o $@
+ @ENABLE_CXX_TRUE@libgnutlsxx_la_DEPENDENCIES = libgnutls.la
+ am__libgnutlsxx_la_SOURCES_DIST = gnutlsxx.cpp
+ @ENABLE_CXX_TRUE@am_libgnutlsxx_la_OBJECTS =  \
diff --git a/security/gnutls/patches/patch-src_benchmark.h b/security/gnutls/patches/patch-src_benchmark.h
new file mode 100644
index 0000000000000..797626c22d883
--- /dev/null
+++ b/security/gnutls/patches/patch-src_benchmark.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_benchmark.h,v 1.1 2013/07/08 08:30:01 wiz Exp $
+
+--- src/benchmark.h.orig	2013-05-25 11:06:37.000000000 +0000
++++ src/benchmark.h
+@@ -24,7 +24,7 @@
+ # include <windows.h>
+ #endif
+ 
+-#if defined(HAVE_CLOCK_GETTIME)
++#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)
+ # undef gettime
+ # define gettime(x) clock_gettime(CLOCK_PROCESS_CPUTIME_ID, x)
+ #else