diff --git a/mingw-w64-gnutls/0001-add-missing-define.patch b/mingw-w64-gnutls/0001-add-missing-define.patch
new file mode 100644
index 0000000000000..b76a180d40f6f
--- /dev/null
+++ b/mingw-w64-gnutls/0001-add-missing-define.patch
@@ -0,0 +1,11 @@
+--- gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in.orig	2015-04-09 23:38:42.018400000 +0300
++++ gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in	2015-04-09 23:39:31.860400000 +0300
+@@ -67,6 +67,8 @@
+ #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
+ #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
+ 
++#define GNUTLS_INTERNAL_BUILD 1
++
+ #if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32)
+ # define _SYM_EXPORT __declspec(dllimport)
+ #else
diff --git a/mingw-w64-gnutls/0002-fix-duplicate-entries.patch b/mingw-w64-gnutls/0002-fix-duplicate-entries.patch
new file mode 100644
index 0000000000000..2b76db5ca3e4c
--- /dev/null
+++ b/mingw-w64-gnutls/0002-fix-duplicate-entries.patch
@@ -0,0 +1,36 @@
+From 7e63027a5caafa55dcca65c5b9bff3bf76c5a41c Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Thu, 9 Apr 2015 16:00:43 +0200
+Subject: [PATCH] remove duplicate entries from manpages Makefile
+
+---
+ doc/manpages/Makefile.am | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 8e793d3..68de757 100644
+--- a/doc/manpages/Makefile.am
++++ b/doc/manpages/Makefile.am
+@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
+ APIMANS += gnutls_certificate_get_peers_subkey_id.3
+ APIMANS += gnutls_certificate_get_trust_list.3
+ APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_key.3
+-APIMANS += gnutls_certificate_get_x509_key.3
+ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
+ APIMANS += gnutls_certificate_server_set_request.3
+ APIMANS += gnutls_certificate_set_dh_params.3
+@@ -1101,7 +1098,7 @@ compare-makefile:
+ 	@echo "******************************************************************************"
+ 	@echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
+ 	@echo "******************************************************************************"
+-	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
++	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
+ 	MANS=""; \
+ 	for i in $$FUNCS; do \
+ 		MANS="$$MANS\nAPIMANS += $$i.3"; \
+--
+libgit2 0.21.4
diff --git a/mingw-w64-gnutls/PKGBUILD b/mingw-w64-gnutls/PKGBUILD
index a0caf18dc8eeb..b34114cf1a717 100644
--- a/mingw-w64-gnutls/PKGBUILD
+++ b/mingw-w64-gnutls/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=gnutls
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.3.14
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer (mingw-w64)"
 arch=('any')
@@ -13,35 +13,45 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-libtasn1"
         "${MINGW_PACKAGE_PREFIX}-gmp"
         "${MINGW_PACKAGE_PREFIX}-zlib"
-        "${MINGW_PACKAGE_PREFIX}-nettle"
-        "${MINGW_PACKAGE_PREFIX}-p11-kit"
+        "${MINGW_PACKAGE_PREFIX}-nettle>=3.1"
+        "${MINGW_PACKAGE_PREFIX}-p11-kit>=0.23.1"
         "${MINGW_PACKAGE_PREFIX}-libgnurx"
         #"${MINGW_PACKAGE_PREFIX}-unbound"
         )
+
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${_realname}-${pkgver}.tar.xz{,.sig}
+# Need remove "autogen" package before building.
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v${pkgver%.*}/${_realname}-${pkgver}.tar.xz{,.sig}
+        0001-add-missing-define.patch
+        0002-fix-duplicate-entries.patch
         0004-fix-gtkdoc.all.patch
         0005-fix-strtok-conflict.mingw.patch)
-md5sums=('7f4465f8c564cf9cb8f5cb38b909f7ca'
+md5sums=('aa015c2666b031044edfb01b01980d84'
          'SKIP'
+         '807a79513358a9f4123f62111f1eed59'
+         '516c3b60e5c2878a0af9f243fd4dac30'
          '86cfab6e7c2ccfcfd1dad9d5024627e3'
          '77287dc835afbb8cc4e9c4aa6b7adb7b')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
+  patch -p1 -i ${srcdir}/0001-add-missing-define.patch
+  patch -p1 -i ${srcdir}/0002-fix-duplicate-entries.patch
   #patch -p1 -i ${srcdir}/0004-fix-gtkdoc.all.patch
   #patch -p1 -i ${srcdir}/0005-fix-strtok-conflict.mingw.patch
 
-  #WANT_AUTOMAKE=latest autoreconf -fi -I m4
+  WANT_AUTOMAKE=latest autoreconf -fi -I m4
 }
 
 build() {
-  # Woraround for localtime_r functions
-  #CFLAGS+=" -DGNULIB_PORTCHECK=1"
-  #CXXFLAGS+=" -DGNULIB_PORTCHECK=1"
+  # Workaround for localtime_r functions
+  CFLAGS+=" -D_POSIX_C_SOURCE"
+  CXXFLAGS+=" -D_POSIX_C_SOURCE"
 
+  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
   mkdir -p "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
+  
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -58,6 +68,7 @@ build() {
     --enable-local-libopts \
     --disable-guile \
     --disable-libdane \
+    --disable-tests \
     gl_cv_double_slash_root=yes
   
   make