diff --git a/net-libs/gnutls/gnutls34-3.4.16.recipe b/net-libs/gnutls/gnutls34-3.4.17.recipe
similarity index 94%
rename from net-libs/gnutls/gnutls34-3.4.16.recipe
rename to net-libs/gnutls/gnutls34-3.4.17.recipe
index 9a9d36f29..6a40255d9 100644
--- a/net-libs/gnutls/gnutls34-3.4.16.recipe
+++ b/net-libs/gnutls/gnutls34-3.4.17.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="2000-2016 Free Software Fundation Inc.
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
-CHECKSUM_SHA256="d99abb1b320771b58c949bab85e4b654dd1e3e9d92e2572204b7dc479d923927"
+CHECKSUM_SHA256="9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e"
 SOURCE_DIR="gnutls-$portVersion"
 PATCHES="gnutls-$portVersion.patchset"
 
@@ -22,7 +22,7 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 PROVIDES="
 	gnutls34$secondaryArchSuffix = $portVersion
 	lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	lib:libgnutls$secondaryArchSuffix = 30.6.8 compat >= 30
+	lib:libgnutls$secondaryArchSuffix = 30.7.0 compat >= 30
 	lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
 	"
 REQUIRES="
@@ -30,8 +30,8 @@ REQUIRES="
 	lib:libgpg_error$secondaryArchSuffix
 	lib:libnettle$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
-	lib:libtasn1$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libtasn1$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 CONFLICTS="
@@ -55,8 +55,8 @@ REQUIRES_bin="
 	lib:libgpg_error$secondaryArchSuffix
 	lib:libnettle$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
-	lib:libtasn1$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libtasn1$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 CONFLICTS_bin="
@@ -67,7 +67,7 @@ CONFLICTS_bin="
 PROVIDES_devel="
 	gnutls${secondaryArchSuffix}_devel = $portVersion
 	devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	devel:libgnutls$secondaryArchSuffix = 30.6.8 compat >= 30
+	devel:libgnutls$secondaryArchSuffix = 30.7.0 compat >= 30
 	devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
 	"
 REQUIRES_devel="
@@ -107,8 +107,6 @@ BUILD_PREREQUIRES="
 	cmd:makeinfo
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:cvs
-	cmd:git
 	"
 
 BUILD()
diff --git a/net-libs/gnutls/gnutls35-3.5.6.recipe b/net-libs/gnutls/gnutls35-3.5.7.recipe
similarity index 92%
rename from net-libs/gnutls/gnutls35-3.5.6.recipe
rename to net-libs/gnutls/gnutls35-3.5.7.recipe
index d94911239..8f8422630 100644
--- a/net-libs/gnutls/gnutls35-3.5.6.recipe
+++ b/net-libs/gnutls/gnutls35-3.5.7.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="2000-2016 Free Software Fundation Inc.
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
-CHECKSUM_SHA256="6338b715bf31c758606ffa489c7f87ee1beab947114fbd2ffefd73170a8c6b9a"
+CHECKSUM_SHA256="60cbfc119e6268cfa38d712621daa473298a0c5b129c0842caec4c1ed4d7861a"
 SOURCE_DIR="gnutls-$portVersion"
 PATCHES="gnutls-$portVersion.patchset"
 
@@ -22,7 +22,7 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 PROVIDES="
 	gnutls35$secondaryArchSuffix = $portVersion
 	lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	lib:libgnutls$secondaryArchSuffix = 30.12.0 compat >= 30
+	lib:libgnutls$secondaryArchSuffix = 30.13.0 compat >= 30
 	lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
 	"
 REQUIRES="
@@ -31,8 +31,9 @@ REQUIRES="
 	lib:libgpg_error$secondaryArchSuffix
 	lib:libnettle$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
-	lib:libtasn1$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libtasn1$secondaryArchSuffix
+	lib:libunistring$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 CONFLICTS="
@@ -56,8 +57,9 @@ REQUIRES_bin="
 	lib:libgpg_error$secondaryArchSuffix
 	lib:libnettle$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
-	lib:libtasn1$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libtasn1$secondaryArchSuffix
+	lib:libunistring$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 CONFLICTS_bin="
@@ -68,7 +70,7 @@ CONFLICTS_bin="
 PROVIDES_devel="
 	gnutls${secondaryArchSuffix}_devel = $portVersion
 	devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	devel:libgnutls$secondaryArchSuffix = 30.12.0 compat >= 30
+	devel:libgnutls$secondaryArchSuffix = 30.13.0 compat >= 30
 	devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
 	"
 REQUIRES_devel="
@@ -90,8 +92,9 @@ BUILD_REQUIRES="
 	devel:libgpg_error$secondaryArchSuffix
 	devel:libnettle$secondaryArchSuffix
 	devel:libgmp$secondaryArchSuffix
-	devel:libtasn1$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libtasn1$secondaryArchSuffix
+	devel:libunistring$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -108,8 +111,6 @@ BUILD_PREREQUIRES="
 	cmd:makeinfo
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:cvs
-	cmd:git
 	"
 
 BUILD()
diff --git a/net-libs/gnutls/patches/gnutls-3.4.16.patchset b/net-libs/gnutls/patches/gnutls-3.4.17.patchset
similarity index 93%
rename from net-libs/gnutls/patches/gnutls-3.4.16.patchset
rename to net-libs/gnutls/patches/gnutls-3.4.17.patchset
index 560332bfb..d52411326 100644
--- a/net-libs/gnutls/patches/gnutls-3.4.16.patchset
+++ b/net-libs/gnutls/patches/gnutls-3.4.17.patchset
@@ -71,12 +71,12 @@ Subject: link mini-dtls-pthread without libpthread.
 
 
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index d546dde..e012ab4 100644
+index f0fcea3..fbe8a0b 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -94,7 +94,7 @@ ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid	\
- 	 mini-session-verify-function auto-verify mini-x509-default-prio \
- 	 global-init-override pcert-list keylog-env
+@@ -95,7 +95,7 @@ ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid	\
+ 	 global-init-override pcert-list keylog-env pkcs7-cat-parse \
+ 	 multi-alerts naked-alerts
  
 -mini_dtls_pthread_LDADD = $(LDADD) -lpthread
 +mini_dtls_pthread_LDADD = $(LDADD)
diff --git a/net-libs/gnutls/patches/gnutls-3.5.6.patchset b/net-libs/gnutls/patches/gnutls-3.5.7.patchset
similarity index 97%
rename from net-libs/gnutls/patches/gnutls-3.5.6.patchset
rename to net-libs/gnutls/patches/gnutls-3.5.7.patchset
index 6970518c6..02e29e97b 100644
--- a/net-libs/gnutls/patches/gnutls-3.5.6.patchset
+++ b/net-libs/gnutls/patches/gnutls-3.5.7.patchset
@@ -71,10 +71,10 @@ Subject: link mini-dtls-pthread without libpthread.
 
 
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 499e821..a0137c9 100644
+index af82633..732c005 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -134,8 +134,8 @@ conv_utf8_LDADD = $(CMOCKA_LDADD)
+@@ -135,8 +135,8 @@ str_idna_LDADD = $(CMOCKA_LDADD)
  
  endif