diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 1b6de5af87..23e53d9a57 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,18 +1,29 @@
 # Template build file for 'gnutls'.
 pkgname=gnutls
-version=3.1.9
-revision=2
-makedepends="pkg-config lzo-devel readline-devel libgpg-error-devel
- libtasn1-devel>=3.2 libgcrypt-devel p11-kit-devel nettle-devel"
+version=3.1.10
+revision=1
 build_style=gnu-configure
 configure_args="--with-zlib --disable-guile --disable-static
- --disable-valgrind-tests"
+ --disable-valgrind-tests --disable-rpath"
 short_desc="GNU Transport Layer Security library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/gnutls/"
 license="GPL-3, LGPL-2.1"
 distfiles="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-${version}.tar.xz"
-checksum=0900c4ae2e026a4c714d88e1aa134db2e0be9ecddf0be9641ade5dafcf877c3e
+checksum=535373f59c88c171429ed3c4777dc7126681b597e3adca95aa88ecbb69e7c646
+
+hostmakedepends="pkg-config which"
+makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
+ libtasn1-devel>=3.2 libgcrypt-devel p11-kit-devel nettle-devel libidn-devel"
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" libtool automake gettext-devel"
+	configure_args+=" --with-libnettle-prefix=$XBPS_CROSS_BASE
+			--with-libz-prefix=$XBPS_CROSS_BASE"
+	pre_configure() {
+		autoreconf -fi
+	}
+fi
 
 gnutls-devel_package() {
 	depends="zlib-devel libtasn1-devel p11-kit-devel nettle-devel
@@ -36,6 +47,6 @@ gnutls-tools_package() {
 
 gnutls_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }