diff --git a/net-libs/gnutls/gnutls35-3.5.14.recipe b/net-libs/gnutls/gnutls36-3.6.0.recipe
similarity index 88%
rename from net-libs/gnutls/gnutls35-3.5.14.recipe
rename to net-libs/gnutls/gnutls36-3.6.0.recipe
index 26839119f..fce34c6d3 100644
--- a/net-libs/gnutls/gnutls35-3.5.14.recipe
+++ b/net-libs/gnutls/gnutls36-3.6.0.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="2000-2017 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="4aa12dec92f42a0434df794aca3d02f6f2a35b47b48c01252de65f355c051bda"
+CHECKSUM_SHA256="2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72"
 SOURCE_DIR="gnutls-$portVersion"
 PATCHES="gnutls-$portVersion.patchset"
 
@@ -20,9 +20,9 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 PROVIDES="
-	gnutls35$secondaryArchSuffix = $portVersion
+	gnutls36$secondaryArchSuffix = $portVersion
 	lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	lib:libgnutls$secondaryArchSuffix = 30.14.6 compat >= 30
+	lib:libgnutls$secondaryArchSuffix = 30.20.0 compat >= 30
 	lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
 	"
 REQUIRES="
@@ -41,7 +41,7 @@ CONFLICTS="
 	"
 
 PROVIDES_bin="
-	gnutls35${secondaryArchSuffix}_bin = $portVersion
+	gnutls36${secondaryArchSuffix}_bin = $portVersion
 	cmd:certtool$secondaryArchSuffix
 	cmd:gnutls_cli$secondaryArchSuffix
 	cmd:gnutls_cli_debug$secondaryArchSuffix
@@ -51,7 +51,7 @@ PROVIDES_bin="
 	cmd:srptool$secondaryArchSuffix
 	"
 REQUIRES_bin="
-	gnutls35$secondaryArchSuffix == $portVersion base
+	gnutls36$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libgpg_error$secondaryArchSuffix
@@ -68,13 +68,13 @@ CONFLICTS_bin="
 	"
 
 PROVIDES_devel="
-	gnutls35${secondaryArchSuffix}_devel = $portVersion
+	gnutls36${secondaryArchSuffix}_devel = $portVersion
 	devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	devel:libgnutls$secondaryArchSuffix = 30.14.6 compat >= 30
+	devel:libgnutls$secondaryArchSuffix = 30.20.0 compat >= 30
 	devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
 	"
 REQUIRES_devel="
-	gnutls35$secondaryArchSuffix == $portVersion base
+	gnutls36$secondaryArchSuffix == $portVersion base
 	devel:libgcrypt$secondaryArchSuffix
 	devel:libgpg_error$secondaryArchSuffix
 	devel:libnettle$secondaryArchSuffix
diff --git a/net-libs/gnutls/patches/gnutls-3.5.14.patchset b/net-libs/gnutls/patches/gnutls-3.6.0.patchset
similarity index 100%
rename from net-libs/gnutls/patches/gnutls-3.5.14.patchset
rename to net-libs/gnutls/patches/gnutls-3.6.0.patchset