diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 96c1ac5c35b..1093f20e99c 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.108 2014/12/12 07:05:59 ajacoutot Exp $
-# rfc2818_hostname.c:107: error: storage size of 'ipv6' isn't known
+# $OpenBSD: Makefile,v 1.109 2015/04/09 07:07:08 ajacoutot Exp $
 
 COMMENT=	GNU Transport Layer Security library
 
-V=		3.2.21
+V=		3.3.14
 DISTNAME=	gnutls-${V}
 EXTRACT_SUFX=	.tar.xz
 
 CATEGORIES=	security
 
-SHARED_LIBS +=  gnutls               41.4     # 58.8
+SHARED_LIBS +=  gnutls               42.0     # 69.6
 SHARED_LIBS +=  gnutlsxx             29.1     # 29.0
-SHARED_LIBS +=  gnutls-xssl          0.0      # 0.0
 SHARED_LIBS +=  gnutls-openssl       27.2     # 27.2
 
 HOMEPAGE=	http://www.gnutls.org/
@@ -42,7 +40,8 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-guile \
 		--disable-valgrind-tests \
-		--with-default-trust-store-file=/etc/ssl/cert.pem
+		--with-default-trust-store-file=/etc/ssl/cert.pem \
+		--with-unbound-root-key-file=/var/unbound/etc/root.key
 
 # OpenBSD's unbound does not provide libdane
 CONFIGURE_ARGS += --disable-libdane
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 300b1669817..6081fd8aef2 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnutls-3.2.21.tar.xz) = gkGWJUz5Fiuf+EFnfyktEIyh76bPiuHAK5qGgqPXCH8=
-SIZE (gnutls-3.2.21.tar.xz) = 5162040
+SHA256 (gnutls-3.3.14.tar.xz) = DfoAMPqtiQnB6QQQUZgjLWvAEjyujPSTOyushe587FI=
+SIZE (gnutls-3.3.14.tar.xz) = 6286196
diff --git a/security/gnutls/patches/patch-lib_x509_rfc2818_hostname_c b/security/gnutls/patches/patch-lib_x509_rfc2818_hostname_c
index 04cb4b6a2ec..5997b994635 100644
--- a/security/gnutls/patches/patch-lib_x509_rfc2818_hostname_c
+++ b/security/gnutls/patches/patch-lib_x509_rfc2818_hostname_c
@@ -1,14 +1,14 @@
-$OpenBSD: patch-lib_x509_rfc2818_hostname_c,v 1.2 2014/08/25 16:27:57 ajacoutot Exp $
+$OpenBSD: patch-lib_x509_rfc2818_hostname_c,v 1.3 2015/04/09 07:07:08 ajacoutot Exp $
 
 rfc2818_hostname.c:107: error: storage size of 'ipv6' isn't known
 
---- lib/x509/rfc2818_hostname.c.orig	Mon Aug 25 17:18:14 2014
-+++ lib/x509/rfc2818_hostname.c	Mon Aug 25 17:18:28 2014
+--- lib/x509/rfc2818_hostname.c.orig	Mon Mar 23 08:19:23 2015
++++ lib/x509/rfc2818_hostname.c	Wed Apr  8 11:07:51 2015
 @@ -25,6 +25,7 @@
  #include <common.h>
  #include <gnutls_errors.h>
  #include <system.h>
 +#include <netinet/in.h>
  
- static int
- check_ip(gnutls_x509_crt_t cert, const void *ip, unsigned ip_size)
+ /**
+  * gnutls_x509_crt_check_hostname:
diff --git a/security/gnutls/pkg/PLIST b/security/gnutls/pkg/PLIST
index f50a5ce88de..13ba5dbfd22 100644
--- a/security/gnutls/pkg/PLIST
+++ b/security/gnutls/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.35 2014/08/21 12:37:27 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.36 2015/04/09 07:07:08 ajacoutot Exp $
 @bin bin/certtool
-@bin bin/danetool
 @bin bin/gnutls-cli
 @bin bin/gnutls-cli-debug
 @bin bin/gnutls-serv
@@ -21,9 +20,10 @@ include/gnutls/openpgp.h
 include/gnutls/openssl.h
 include/gnutls/pkcs11.h
 include/gnutls/pkcs12.h
+include/gnutls/self-test.h
 include/gnutls/tpm.h
+include/gnutls/x509-ext.h
 include/gnutls/x509.h
-include/gnutls/xssl.h
 info/gnutls-client-server-use-case.png
 @info info/gnutls-guile.info
 info/gnutls-handshake-sequence.png
@@ -39,9 +39,6 @@ info/pkcs11-vision.png
 lib/libgnutls-openssl.a
 lib/libgnutls-openssl.la
 @lib lib/libgnutls-openssl.so.${LIBgnutls-openssl_VERSION}
-lib/libgnutls-xssl.a
-lib/libgnutls-xssl.la
-@lib lib/libgnutls-xssl.so.${LIBgnutls-xssl_VERSION}
 lib/libgnutls.a
 lib/libgnutls.la
 @lib lib/libgnutls.so.${LIBgnutls_VERSION}
@@ -126,6 +123,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem.3
 @man man/man3/gnutls_certificate_set_x509_system_trust.3
 @man man/man3/gnutls_certificate_set_x509_trust.3
+@man man/man3/gnutls_certificate_set_x509_trust_dir.3
 @man man/man3/gnutls_certificate_set_x509_trust_file.3
 @man man/man3/gnutls_certificate_set_x509_trust_mem.3
 @man man/man3/gnutls_certificate_type_get.3
@@ -134,6 +132,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_certificate_type_list.3
 @man man/man3/gnutls_certificate_type_set_priority.3
 @man man/man3/gnutls_certificate_verification_status_print.3
+@man man/man3/gnutls_certificate_verify_peers.3
 @man man/man3/gnutls_certificate_verify_peers2.3
 @man man/man3/gnutls_certificate_verify_peers3.3
 @man man/man3/gnutls_check_version.3
@@ -152,6 +151,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_cipher_get_tag_size.3
 @man man/man3/gnutls_cipher_init.3
 @man man/man3/gnutls_cipher_list.3
+@man man/man3/gnutls_cipher_self_test.3
 @man man/man3/gnutls_cipher_set_iv.3
 @man man/man3/gnutls_cipher_set_priority.3
 @man man/man3/gnutls_cipher_suite_get_name.3
@@ -163,6 +163,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_compression_list.3
 @man man/man3/gnutls_compression_set_priority.3
 @man man/man3/gnutls_credentials_clear.3
+@man man/man3/gnutls_credentials_get.3
 @man man/man3/gnutls_credentials_set.3
 @man man/man3/gnutls_db_check_entry.3
 @man man/man3/gnutls_db_check_entry_time.3
@@ -193,6 +194,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_digest_get_id.3
 @man man/man3/gnutls_digest_get_name.3
 @man man/man3/gnutls_digest_list.3
+@man man/man3/gnutls_digest_self_test.3
 @man man/man3/gnutls_dtls_cookie_send.3
 @man man/man3/gnutls_dtls_cookie_verify.3
 @man man/man3/gnutls_dtls_get_data_mtu.3
@@ -210,6 +212,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_error_to_alert.3
 @man man/man3/gnutls_est_record_overhead_size.3
 @man man/man3/gnutls_fingerprint.3
+@man man/man3/gnutls_fips140_mode_enabled.3
 @man man/man3/gnutls_global_deinit.3
 @man man/man3/gnutls_global_init.3
 @man man/man3/gnutls_global_set_audit_log_function.3
@@ -264,6 +267,7 @@ lib/pkgconfig/gnutls.pc
 @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_self_test.3
 @man man/man3/gnutls_mac_set_priority.3
 @man man/man3/gnutls_ocsp_req_add_cert.3
 @man man/man3/gnutls_ocsp_req_add_cert_id.3
@@ -302,6 +306,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_ocsp_status_request_get.3
 @man man/man3/gnutls_ocsp_status_request_is_checked.3
 @man man/man3/gnutls_openpgp_crt_check_hostname.3
+@man man/man3/gnutls_openpgp_crt_check_hostname2.3
 @man man/man3/gnutls_openpgp_crt_deinit.3
 @man man/man3/gnutls_openpgp_crt_export.3
 @man man/man3/gnutls_openpgp_crt_export2.3
@@ -368,6 +373,8 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_openpgp_privkey_sign_hash.3
 @man man/man3/gnutls_openpgp_send_cert.3
 @man man/man3/gnutls_openpgp_set_recv_key_function.3
+@man man/man3/gnutls_packet_deinit.3
+@man man/man3/gnutls_packet_get.3
 @man man/man3/gnutls_pcert_deinit.3
 @man man/man3/gnutls_pcert_import_openpgp.3
 @man man/man3/gnutls_pcert_import_openpgp_raw.3
@@ -384,11 +391,13 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_pk_get_id.3
 @man man/man3/gnutls_pk_get_name.3
 @man man/man3/gnutls_pk_list.3
+@man man/man3/gnutls_pk_self_test.3
 @man man/man3/gnutls_pk_to_sign.3
 @man man/man3/gnutls_pkcs11_add_provider.3
 @man man/man3/gnutls_pkcs11_copy_secret_key.3
 @man man/man3/gnutls_pkcs11_copy_x509_crt.3
 @man man/man3/gnutls_pkcs11_copy_x509_privkey.3
+@man man/man3/gnutls_pkcs11_crt_is_known.3
 @man man/man3/gnutls_pkcs11_deinit.3
 @man man/man3/gnutls_pkcs11_delete_url.3
 @man man/man3/gnutls_pkcs11_get_pin_function.3
@@ -399,6 +408,9 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_pkcs11_obj_export2.3
 @man man/man3/gnutls_pkcs11_obj_export3.3
 @man man/man3/gnutls_pkcs11_obj_export_url.3
+@man man/man3/gnutls_pkcs11_obj_flags_get_str.3
+@man man/man3/gnutls_pkcs11_obj_get_exts.3
+@man man/man3/gnutls_pkcs11_obj_get_flags.3
 @man man/man3/gnutls_pkcs11_obj_get_info.3
 @man man/man3/gnutls_pkcs11_obj_get_type.3
 @man man/man3/gnutls_pkcs11_obj_import_url.3
@@ -407,6 +419,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_pkcs11_obj_list_import_url2.3
 @man man/man3/gnutls_pkcs11_obj_set_pin_function.3
 @man man/man3/gnutls_pkcs11_privkey_deinit.3
+@man man/man3/gnutls_pkcs11_privkey_export_pubkey.3
 @man man/man3/gnutls_pkcs11_privkey_export_url.3
 @man man/man3/gnutls_pkcs11_privkey_generate.3
 @man man/man3/gnutls_pkcs11_privkey_generate2.3
@@ -483,14 +496,21 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_priority_sign_list.3
 @man man/man3/gnutls_privkey_decrypt_data.3
 @man man/man3/gnutls_privkey_deinit.3
+@man man/man3/gnutls_privkey_export_dsa_raw.3
+@man man/man3/gnutls_privkey_export_ecc_raw.3
+@man man/man3/gnutls_privkey_export_rsa_raw.3
+@man man/man3/gnutls_privkey_generate.3
 @man man/man3/gnutls_privkey_get_pk_algorithm.3
 @man man/man3/gnutls_privkey_get_type.3
+@man man/man3/gnutls_privkey_import_dsa_raw.3
+@man man/man3/gnutls_privkey_import_ecc_raw.3
 @man man/man3/gnutls_privkey_import_ext.3
 @man man/man3/gnutls_privkey_import_ext2.3
 @man man/man3/gnutls_privkey_import_openpgp.3
 @man man/man3/gnutls_privkey_import_openpgp_raw.3
 @man man/man3/gnutls_privkey_import_pkcs11.3
 @man man/man3/gnutls_privkey_import_pkcs11_url.3
+@man man/man3/gnutls_privkey_import_rsa_raw.3
 @man man/man3/gnutls_privkey_import_tpm_raw.3
 @man man/man3/gnutls_privkey_import_tpm_url.3
 @man man/man3/gnutls_privkey_import_url.3
@@ -502,6 +522,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_privkey_sign_hash.3
 @man man/man3/gnutls_privkey_sign_raw_data.3
 @man man/man3/gnutls_privkey_status.3
+@man man/man3/gnutls_privkey_verify_params.3
 @man man/man3/gnutls_protocol_get_id.3
 @man man/man3/gnutls_protocol_get_name.3
 @man man/man3/gnutls_protocol_get_version.3
@@ -525,14 +546,14 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_pubkey_encrypt_data.3
 @man man/man3/gnutls_pubkey_export.3
 @man man/man3/gnutls_pubkey_export2.3
+@man man/man3/gnutls_pubkey_export_dsa_raw.3
+@man man/man3/gnutls_pubkey_export_ecc_raw.3
+@man man/man3/gnutls_pubkey_export_ecc_x962.3
+@man man/man3/gnutls_pubkey_export_rsa_raw.3
 @man man/man3/gnutls_pubkey_get_key_id.3
 @man man/man3/gnutls_pubkey_get_key_usage.3
 @man man/man3/gnutls_pubkey_get_openpgp_key_id.3
 @man man/man3/gnutls_pubkey_get_pk_algorithm.3
-@man man/man3/gnutls_pubkey_get_pk_dsa_raw.3
-@man man/man3/gnutls_pubkey_get_pk_ecc_raw.3
-@man man/man3/gnutls_pubkey_get_pk_ecc_x962.3
-@man man/man3/gnutls_pubkey_get_pk_rsa_raw.3
 @man man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3
 @man man/man3/gnutls_pubkey_get_verify_algorithm.3
 @man man/man3/gnutls_pubkey_import.3
@@ -559,6 +580,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_pubkey_verify_data2.3
 @man man/man3/gnutls_pubkey_verify_hash.3
 @man man/man3/gnutls_pubkey_verify_hash2.3
+@man man/man3/gnutls_pubkey_verify_params.3
 @man man/man3/gnutls_random_art.3
 @man man/man3/gnutls_range_split.3
 @man man/man3/gnutls_record_can_use_length_hiding.3
@@ -571,6 +593,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_record_get_max_size.3
 @man man/man3/gnutls_record_overhead_size.3
 @man man/man3/gnutls_record_recv.3
+@man man/man3/gnutls_record_recv_packet.3
 @man man/man3/gnutls_record_recv_seq.3
 @man man/man3/gnutls_record_send.3
 @man man/man3/gnutls_record_send_range.3
@@ -594,6 +617,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_safe_renegotiation_status.3
 @man man/man3/gnutls_sec_param_get_name.3
 @man man/man3/gnutls_sec_param_to_pk_bits.3
+@man man/man3/gnutls_sec_param_to_symmetric_bits.3
 @man man/man3/gnutls_server_name_get.3
 @man man/man3/gnutls_server_name_set.3
 @man man/man3/gnutls_session_channel_binding.3
@@ -642,6 +666,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_srp_set_prime_bits.3
 @man man/man3/gnutls_srp_set_server_credentials_file.3
 @man man/man3/gnutls_srp_set_server_credentials_function.3
+@man man/man3/gnutls_srp_set_server_fake_salt_seed.3
 @man man/man3/gnutls_srp_verifier.3
 @man man/man3/gnutls_srtp_get_keys.3
 @man man/man3/gnutls_srtp_get_mki.3
@@ -655,6 +680,10 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_store_pubkey.3
 @man man/man3/gnutls_strerror.3
 @man man/man3/gnutls_strerror_name.3
+@man man/man3/gnutls_subject_alt_names_deinit.3
+@man man/man3/gnutls_subject_alt_names_get.3
+@man man/man3/gnutls_subject_alt_names_init.3
+@man man/man3/gnutls_subject_alt_names_set.3
 @man man/man3/gnutls_supplemental_get_name.3
 @man man/man3/gnutls_tdb_deinit.3
 @man man/man3/gnutls_tdb_init.3
@@ -682,8 +711,22 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_transport_set_vec_push_function.3
 @man man/man3/gnutls_url_is_supported.3
 @man man/man3/gnutls_verify_stored_pubkey.3
+@man man/man3/gnutls_x509_aia_deinit.3
+@man man/man3/gnutls_x509_aia_get.3
+@man man/man3/gnutls_x509_aia_init.3
+@man man/man3/gnutls_x509_aia_set.3
+@man man/man3/gnutls_x509_aki_deinit.3
+@man man/man3/gnutls_x509_aki_get_cert_issuer.3
+@man man/man3/gnutls_x509_aki_get_id.3
+@man man/man3/gnutls_x509_aki_init.3
+@man man/man3/gnutls_x509_aki_set_cert_issuer.3
+@man man/man3/gnutls_x509_aki_set_id.3
 @man man/man3/gnutls_x509_crl_check_issuer.3
 @man man/man3/gnutls_x509_crl_deinit.3
+@man man/man3/gnutls_x509_crl_dist_points_deinit.3
+@man man/man3/gnutls_x509_crl_dist_points_get.3
+@man man/man3/gnutls_x509_crl_dist_points_init.3
+@man man/man3/gnutls_x509_crl_dist_points_set.3
 @man man/man3/gnutls_x509_crl_export.3
 @man man/man3/gnutls_x509_crl_export2.3
 @man man/man3/gnutls_x509_crl_get_authority_key_gn_serial.3
@@ -692,6 +735,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_crl_get_crt_serial.3
 @man man/man3/gnutls_x509_crl_get_dn_oid.3
 @man man/man3/gnutls_x509_crl_get_extension_data.3
+@man man/man3/gnutls_x509_crl_get_extension_data2.3
 @man man/man3/gnutls_x509_crl_get_extension_info.3
 @man man/man3/gnutls_x509_crl_get_extension_oid.3
 @man man/man3/gnutls_x509_crl_get_issuer_dn.3
@@ -706,6 +750,8 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_crl_get_version.3
 @man man/man3/gnutls_x509_crl_import.3
 @man man/man3/gnutls_x509_crl_init.3
+@man man/man3/gnutls_x509_crl_iter_crt_serial.3
+@man man/man3/gnutls_x509_crl_iter_deinit.3
 @man man/man3/gnutls_x509_crl_list_import.3
 @man man/man3/gnutls_x509_crl_list_import2.3
 @man man/man3/gnutls_x509_crl_print.3
@@ -733,7 +779,9 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_crq_get_dn_by_oid.3
 @man man/man3/gnutls_x509_crq_get_dn_oid.3
 @man man/man3/gnutls_x509_crq_get_extension_by_oid.3
+@man man/man3/gnutls_x509_crq_get_extension_by_oid2.3
 @man man/man3/gnutls_x509_crq_get_extension_data.3
+@man man/man3/gnutls_x509_crq_get_extension_data2.3
 @man man/man3/gnutls_x509_crq_get_extension_info.3
 @man man/man3/gnutls_x509_crq_get_key_id.3
 @man man/man3/gnutls_x509_crq_get_key_purpose_oid.3
@@ -765,6 +813,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_crq_sign2.3
 @man man/man3/gnutls_x509_crq_verify.3
 @man man/man3/gnutls_x509_crt_check_hostname.3
+@man man/man3/gnutls_x509_crt_check_hostname2.3
 @man man/man3/gnutls_x509_crt_check_issuer.3
 @man man/man3/gnutls_x509_crt_check_revocation.3
 @man man/man3/gnutls_x509_crt_cpy_crl_dist_points.3
@@ -784,7 +833,9 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_crt_get_dn_oid.3
 @man man/man3/gnutls_x509_crt_get_expiration_time.3
 @man man/man3/gnutls_x509_crt_get_extension_by_oid.3
+@man man/man3/gnutls_x509_crt_get_extension_by_oid2.3
 @man man/man3/gnutls_x509_crt_get_extension_data.3
+@man man/man3/gnutls_x509_crt_get_extension_data2.3
 @man man/man3/gnutls_x509_crt_get_extension_info.3
 @man man/man3/gnutls_x509_crt_get_extension_oid.3
 @man man/man3/gnutls_x509_crt_get_fingerprint.3
@@ -800,6 +851,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_crt_get_key_id.3
 @man man/man3/gnutls_x509_crt_get_key_purpose_oid.3
 @man man/man3/gnutls_x509_crt_get_key_usage.3
+@man man/man3/gnutls_x509_crt_get_name_constraints.3
 @man man/man3/gnutls_x509_crt_get_pk_algorithm.3
 @man man/man3/gnutls_x509_crt_get_pk_dsa_raw.3
 @man man/man3/gnutls_x509_crt_get_pk_rsa_raw.3
@@ -843,11 +895,13 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_crt_set_dn_by_oid.3
 @man man/man3/gnutls_x509_crt_set_expiration_time.3
 @man man/man3/gnutls_x509_crt_set_extension_by_oid.3
+@man man/man3/gnutls_x509_crt_set_issuer_alt_name.3
 @man man/man3/gnutls_x509_crt_set_issuer_dn.3
 @man man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3
 @man man/man3/gnutls_x509_crt_set_key.3
 @man man/man3/gnutls_x509_crt_set_key_purpose_oid.3
 @man man/man3/gnutls_x509_crt_set_key_usage.3
+@man man/man3/gnutls_x509_crt_set_name_constraints.3
 @man man/man3/gnutls_x509_crt_set_pin_function.3
 @man man/man3/gnutls_x509_crt_set_policy.3
 @man man/man3/gnutls_x509_crt_set_private_key_usage_period.3
@@ -872,6 +926,49 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_dn_init.3
 @man man/man3/gnutls_x509_dn_oid_known.3
 @man man/man3/gnutls_x509_dn_oid_name.3
+@man man/man3/gnutls_x509_ext_deinit.3
+@man man/man3/gnutls_x509_ext_export_aia.3
+@man man/man3/gnutls_x509_ext_export_authority_key_id.3
+@man man/man3/gnutls_x509_ext_export_basic_constraints.3
+@man man/man3/gnutls_x509_ext_export_crl_dist_points.3
+@man man/man3/gnutls_x509_ext_export_key_purposes.3
+@man man/man3/gnutls_x509_ext_export_key_usage.3
+@man man/man3/gnutls_x509_ext_export_name_constraints.3
+@man man/man3/gnutls_x509_ext_export_policies.3
+@man man/man3/gnutls_x509_ext_export_private_key_usage_period.3
+@man man/man3/gnutls_x509_ext_export_proxy.3
+@man man/man3/gnutls_x509_ext_export_subject_alt_names.3
+@man man/man3/gnutls_x509_ext_export_subject_key_id.3
+@man man/man3/gnutls_x509_ext_import_aia.3
+@man man/man3/gnutls_x509_ext_import_authority_key_id.3
+@man man/man3/gnutls_x509_ext_import_basic_constraints.3
+@man man/man3/gnutls_x509_ext_import_crl_dist_points.3
+@man man/man3/gnutls_x509_ext_import_key_purposes.3
+@man man/man3/gnutls_x509_ext_import_key_usage.3
+@man man/man3/gnutls_x509_ext_import_name_constraints.3
+@man man/man3/gnutls_x509_ext_import_policies.3
+@man man/man3/gnutls_x509_ext_import_private_key_usage_period.3
+@man man/man3/gnutls_x509_ext_import_proxy.3
+@man man/man3/gnutls_x509_ext_import_subject_alt_names.3
+@man man/man3/gnutls_x509_ext_import_subject_key_id.3
+@man man/man3/gnutls_x509_ext_print.3
+@man man/man3/gnutls_x509_key_purpose_deinit.3
+@man man/man3/gnutls_x509_key_purpose_get.3
+@man man/man3/gnutls_x509_key_purpose_init.3
+@man man/man3/gnutls_x509_key_purpose_set.3
+@man man/man3/gnutls_x509_name_constraints_add_excluded.3
+@man man/man3/gnutls_x509_name_constraints_add_permitted.3
+@man man/man3/gnutls_x509_name_constraints_check.3
+@man man/man3/gnutls_x509_name_constraints_check_crt.3
+@man man/man3/gnutls_x509_name_constraints_deinit.3
+@man man/man3/gnutls_x509_name_constraints_get_excluded.3
+@man man/man3/gnutls_x509_name_constraints_get_permitted.3
+@man man/man3/gnutls_x509_name_constraints_init.3
+@man man/man3/gnutls_x509_othername_to_virtual.3
+@man man/man3/gnutls_x509_policies_deinit.3
+@man man/man3/gnutls_x509_policies_get.3
+@man man/man3/gnutls_x509_policies_init.3
+@man man/man3/gnutls_x509_policies_set.3
 @man man/man3/gnutls_x509_policy_release.3
 @man man/man3/gnutls_x509_privkey_cpy.3
 @man man/man3/gnutls_x509_privkey_deinit.3
@@ -908,6 +1005,7 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_trust_list_add_crls.3
 @man man/man3/gnutls_x509_trust_list_add_named_crt.3
 @man man/man3/gnutls_x509_trust_list_add_system_trust.3
+@man man/man3/gnutls_x509_trust_list_add_trust_dir.3
 @man man/man3/gnutls_x509_trust_list_add_trust_file.3
 @man man/man3/gnutls_x509_trust_list_add_trust_mem.3
 @man man/man3/gnutls_x509_trust_list_deinit.3
@@ -917,19 +1015,8 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_trust_list_remove_trust_file.3
 @man man/man3/gnutls_x509_trust_list_remove_trust_mem.3
 @man man/man3/gnutls_x509_trust_list_verify_crt.3
+@man man/man3/gnutls_x509_trust_list_verify_crt2.3
 @man man/man3/gnutls_x509_trust_list_verify_named_crt.3
-@man man/man3/xssl_client_init.3
-@man man/man3/xssl_cred_deinit.3
-@man man/man3/xssl_cred_init.3
-@man man/man3/xssl_deinit.3
-@man man/man3/xssl_flush.3
-@man man/man3/xssl_get_session.3
-@man man/man3/xssl_getdelim.3
-@man man/man3/xssl_printf.3
-@man man/man3/xssl_read.3
-@man man/man3/xssl_server_init.3
-@man man/man3/xssl_sinit.3
-@man man/man3/xssl_write.3
 share/doc/gnutls/
 share/doc/gnutls/README
 share/examples/gnutls/
@@ -942,8 +1029,6 @@ 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