diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index da73bc1e63..5581ceff46 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -5,8 +5,9 @@ revision=1
 build_style=gnu-configure
 configure_args="--with-zlib --disable-guile --disable-static
  --disable-valgrind-tests --disable-rpath
- --with-libnettle-prefix=$XBPS_CROSS_BASE/usr
- --with-libz-prefix=$XBPS_CROSS_BASE/usr"
+ --with-libz-prefix=$XBPS_CROSS_BASE/usr
+ gl_cv_func_strerror_0_works=yes gl_cv_func_working_strerror=yes
+ gl_cv_func_strerror_r_works=yes"
 short_desc="GNU Transport Layer Security library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/gnutls/"
@@ -14,16 +15,13 @@ license="GPL-3, LGPL-2.1"
 distfiles="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-${version}.tar.xz"
 checksum=7ca3e261402e90344585cbd5cc54379f4e294697b2cc7cd979458707666ac872
 
-hostmakedepends="pkg-config which"
+hostmakedepends="pkg-config which libtool"
 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"
-	pre_configure() {
-		autoreconf -fi
-	}
-fi
+pre_configure() {
+	libtoolize -f
+}
 
 gnutls-devel_package() {
 	depends="zlib-devel libtasn1-devel p11-kit-devel nettle-devel