diff --git a/packages/security/gnutls/meta b/packages/security/gnutls/meta
index d3f2514d52..37a20c5afe 100644
--- a/packages/security/gnutls/meta
+++ b/packages/security/gnutls/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="gnutls"
-PKG_VERSION="3.0.25"
+PKG_VERSION="3.1.6"
 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.xz"
+PKG_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="cryptodev-linux zlib nettle"
 PKG_BUILD_DEPENDS="toolchain cryptodev-linux zlib nettle"
 PKG_PRIORITY="optional"
diff --git a/packages/security/gnutls/patches/gnutls-3.0.25-automake-1.13.patch b/packages/security/gnutls/patches/gnutls-3.0.25-automake-1.13.patch
deleted file mode 100644
index adee8bbb49..0000000000
--- a/packages/security/gnutls/patches/gnutls-3.0.25-automake-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gnutls-3.0.25/configure.ac gnutls-3.0.25.patch/configure.ac
---- gnutls-3.0.25/configure.ac	2012-10-12 17:08:55.000000000 +0200
-+++ gnutls-3.0.25.patch/configure.ac	2013-01-12 02:31:30.475591948 +0100
-@@ -27,7 +27,7 @@
- 
- AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_MSG_RESULT([***
- *** Checking for compilation programs...
diff --git a/packages/security/gnutls/patches/gnutls-3.0.25-automake.patch b/packages/security/gnutls/patches/gnutls-3.0.25-automake.patch
deleted file mode 100644
index 833436011c..0000000000
--- a/packages/security/gnutls/patches/gnutls-3.0.25-automake.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur gnutls-3.0.20/configure.ac gnutls-3.0.20.patch/configure.ac
---- gnutls-3.0.20/configure.ac	2012-05-26 09:31:17.000000000 +0200
-+++ gnutls-3.0.20.patch/configure.ac	2012-06-13 22:02:17.364789323 +0200
-@@ -25,7 +25,7 @@
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_MACRO_DIR([m4])
- 
--AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
-+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AM_CONFIG_HEADER(config.h)
- 
-@@ -35,6 +35,10 @@
- 
- dnl Checks for programs.
- AC_PROG_CC
-+
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
- AM_PROG_AS
- AC_PROG_CXX
- gl_EARLY
diff --git a/packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch b/packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch
new file mode 100644
index 0000000000..fa29af85a6
--- /dev/null
+++ b/packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch
@@ -0,0 +1,26 @@
+diff -Naur gnutls-3.1.6/configure.ac gnutls-3.1.6.patch/configure.ac
+--- gnutls-3.1.6/configure.ac	2013-01-02 19:01:38.000000000 +0100
++++ gnutls-3.1.6.patch/configure.ac	2013-01-16 00:59:04.022275973 +0100
+@@ -25,9 +25,9 @@
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_MSG_RESULT([***
+ *** Checking for compilation programs...
+@@ -35,6 +35,10 @@
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
++
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
+ AM_PROG_AS
+ AC_PROG_CXX
+ gl_EARLY