diff --git a/net-libs/gnutls/gnutls36-3.6.2.recipe b/net-libs/gnutls/gnutls36-3.6.3.recipe
similarity index 94%
rename from net-libs/gnutls/gnutls36-3.6.2.recipe
rename to net-libs/gnutls/gnutls36-3.6.3.recipe
index 574de3eaf..60c1fb608 100644
--- a/net-libs/gnutls/gnutls36-3.6.2.recipe
+++ b/net-libs/gnutls/gnutls36-3.6.3.recipe
@@ -11,16 +11,16 @@ COPYRIGHT="2000-2018 Free Software Fundation Inc.
 	2000-2004 Nikos Mavrogiannopoulos"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
-CHECKSUM_SHA256="bcd5db7b234e02267f36b5d13cf5214baac232b7056a506252b7574ea7738d1f"
+SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
+CHECKSUM_SHA256="ed642b66a4ecf4851ab2d809cd1475c297b6201d8e8bd14b4d1c08b53ffca993"
 SOURCE_DIR="gnutls-$portVersion"
 PATCHES="gnutls-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
 
 libgnutls_opensslVersion="27.0.2"
-libgnutlsVersion="30.20.2"
+libgnutlsVersion="30.21.0"
 libgnutlsxxVersion="28.1.0"
 
 libgnutls_opensslVersionCompat="$libgnutls_opensslVersion compat >= ${libgnutls_opensslVersion%%.*}"
@@ -130,6 +130,7 @@ BUILD_PREREQUIRES="
 	"
 
 TEST_REQUIRES="
+	cmd:cvs
 	cmd:git
 	"
 
@@ -140,7 +141,6 @@ defineDebugInfoPackage gnutls36$secondaryArchSuffix \
 
 BUILD()
 {
-	autoreconf -fi
 	runConfigure ./configure --without-p11-kit --disable-nls \
 		--enable-openssl-compatibility
 	make $jobArgs
diff --git a/net-libs/gnutls/patches/gnutls-3.6.2.patchset b/net-libs/gnutls/patches/gnutls-3.6.3.patchset
similarity index 73%
rename from net-libs/gnutls/patches/gnutls-3.6.2.patchset
rename to net-libs/gnutls/patches/gnutls-3.6.3.patchset
index 01f0e31bb..c09933e91 100644
--- a/net-libs/gnutls/patches/gnutls-3.6.2.patchset
+++ b/net-libs/gnutls/patches/gnutls-3.6.3.patchset
@@ -5,7 +5,7 @@ Subject: include sys/select.h
 
 
 diff --git a/tests/mini-dtls-mtu.c b/tests/mini-dtls-mtu.c
-index 8210608..8da58b9 100644
+index 1ae7325..b70db98 100644
 --- a/tests/mini-dtls-mtu.c
 +++ b/tests/mini-dtls-mtu.c
 @@ -24,6 +24,9 @@
@@ -47,10 +47,10 @@ index 9ace1a5..b087721 100644
  #include <string.h>
  #include <errno.h>
 diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c
-index e346e7e..fff3f82 100644
+index 02b0546..7dc0319 100644
 --- a/tests/mini-record-failure.c
 +++ b/tests/mini-record-failure.c
-@@ -26,6 +26,9 @@
+@@ -27,6 +27,9 @@
  
  #include <stdio.h>
  #include <stdlib.h>
@@ -64,29 +64,6 @@ index e346e7e..fff3f82 100644
 2.16.1
 
 
-From aa560535eef19064c892a1051492576fdd54183c Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Wed, 15 Jun 2016 11:04:44 +0000
-Subject: Do not skip the test-float test in gl/tests/.
-
-
-diff --git a/gl/tests/test-float.c b/gl/tests/test-float.c
-index 1c95b12..fbc2862 100644
---- a/gl/tests/test-float.c
-+++ b/gl/tests/test-float.c
-@@ -23,7 +23,7 @@
- #include "fpucw.h"
- #include "macros.h"
- 
--#if 0
-+#if 1
- 
- /* Check that FLT_RADIX is a constant expression.  */
- int a[] = { FLT_RADIX };
--- 
-2.16.1
-
-
 From b2826162157672e4b8ea7d0ceb03282e596734e1 Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Wed, 6 Jul 2016 22:11:20 +0000
@@ -106,3 +83,26 @@ index 34978d3..96b1067 100755
 -- 
 2.9.0
 
+
+From 4470c1235656f1345eef680f9f532fb1cace36ab Mon Sep 17 00:00:00 2001
+From: fbrosson <fbrosson@localhost>
+Date: Wed, 18 Jul 2018 07:44:23 +0000
+Subject: doc/examples/tlsproxy/tlsproxy.c calls strdupa and fails to build
+
+so let's just skip it for now.
+
+diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
+index c40bf4f..85c6bd6 100644
+--- a/doc/examples/Makefile.am
++++ b/doc/examples/Makefile.am
+@@ -74,7 +74,6 @@ if ENABLE_SRP
+ noinst_PROGRAMS += ex-client-srp ex-serv-srp
+ endif
+ 
+-noinst_PROGRAMS += tlsproxy/tlsproxy
+ 
+ tlsproxy_tlsproxy_SOURCES = tlsproxy/buffer.c tlsproxy/buffer.h tlsproxy/crypto-gnutls.c \
+ 	tlsproxy/crypto-gnutls.h tlsproxy/tlsproxy.c
+-- 
+2.18.0
+