diff --git a/packages/security/gnutls/build b/packages/security/gnutls/build
index 8189b6997b..c36e5b94f6 100755
--- a/packages/security/gnutls/build
+++ b/packages/security/gnutls/build
@@ -26,8 +26,6 @@
   strip_lto
 
 cd $PKG_BUILD
-
-cd lib
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -35,35 +33,30 @@ cd lib
             --localstatedir=/var \
             --disable-static \
             --enable-shared \
+            --enable-hardware-acceleration \
+            --enable-cryptodev \
+            --enable-openssl-compatibility \
+            --without-p11-kit \
             --with-included-libtasn1 \
-            --with-lzo \
+            --with-included-libcfg \
+            --with-libnettle-prefix="$SYSROOT_PREFIX/usr" \
             --with-libz-prefix="$SYSROOT_PREFIX/usr" \
-            --with-libgcrypt \
-            --with-libgcrypt-prefix="$SYSROOT_PREFIX/usr" \
+            --disable-gtk-doc \
+            --disable-gtk-doc-html \
+            --disable-gtk-doc-pdf \
             --disable-nls \
+            --disable-guile \
+            --disable-valgrind-tests \
             --with-gnu-ld
 
-#            --enable-cryptodev \ # TODO: add later
+#            --enable-extra-pki \
+#            --enable-srp-authentication \
+#            --enable-anon-authentication \
+#            --disable-psk-authentication=yes \
+#            --disable-openpgp-authentication=yes \
 
-make
-$MAKEINSTALL
-
-cd ../libextra
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --with-included-libtasn1 \
-            --with-lzo \
-            --with-libgcrypt \
-            --with-libgcrypt-prefix="$SYSROOT_PREFIX/usr" \
-            --with-gnu-ld
-
-#            --enable-openssl-compatibility \
-#            --enable-cryptodev \ # TODO: add later
-
-make
-$MAKEINSTALL
+make -C gl
+make -C lib
+make -C extra
+$MAKEINSTALL -C lib
+$MAKEINSTALL -C extra
diff --git a/packages/security/gnutls/install b/packages/security/gnutls/install
index baec342186..9591cfe7d6 100755
--- a/packages/security/gnutls/install
+++ b/packages/security/gnutls/install
@@ -26,7 +26,5 @@ mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/lib/.libs/libgnutls.so* $INSTALL/usr/lib
   cp -P $PKG_BUILD/lib/.libs/libgnutlsxx.so* $INSTALL/usr/lib
     rm -rf $INSTALL/usr/lib/libgnutlsxx.so*T
-  cp -P $PKG_BUILD/libextra/.libs/libgnutls-extra.so* $INSTALL/usr/lib
-    rm -rf $INSTALL/usr/lib/libgnutls-extra.so*T
-  cp -P $PKG_BUILD/libextra/.libs/libgnutls-openssl.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/extra/.libs/libgnutls-openssl.so* $INSTALL/usr/lib
     rm -rf $INSTALL/usr/lib/libgnutls-openssl.so*T
diff --git a/packages/security/gnutls/meta b/packages/security/gnutls/meta
index 6d34bf55cc..97734a5e61 100644
--- a/packages/security/gnutls/meta
+++ b/packages/security/gnutls/meta
@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="gnutls"
-PKG_VERSION="2.10.5"
+PKG_VERSION="3.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gnutls.org/"
-PKG_URL="http://ftp.gnu.org/gnu/gnutls/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="zlib lzo libgcrypt"
-PKG_BUILD_DEPENDS="toolchain zlib lzo libgcrypt"
+PKG_URL="http://ftp.gnu.org/gnu/gnutls/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="cryptodev-linux zlib nettle"
+PKG_BUILD_DEPENDS="toolchain cryptodev-linux zlib nettle"
 PKG_PRIORITY="optional"
 PKG_SECTION="security"
 PKG_SHORTDESC="gnutls: Development Library for TLS applications"