diff --git a/srcpkgs/gnutls/gnutls-tools.template b/srcpkgs/gnutls/gnutls-tools.template
index 5b43dad37f..d63bfdc010 100644
--- a/srcpkgs/gnutls/gnutls-tools.template
+++ b/srcpkgs/gnutls/gnutls-tools.template
@@ -1,15 +1,11 @@
 # Template file for 'gnutls-tools'.
 #
-revision=1
 short_desc="${short_desc} (bundled tools)"
 long_desc="${long_desc}
 
  This package contains the tools that come with gnutls."
 
-Add_dependency run libgcrypt
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/share/man
 	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/share/man/man1 ${DESTDIR}/usr/share/man
diff --git a/srcpkgs/gnutls/gnutls.rshlibs b/srcpkgs/gnutls/gnutls.rshlibs
index 14e2357be0..ce758bccc7 100644
--- a/srcpkgs/gnutls/gnutls.rshlibs
+++ b/srcpkgs/gnutls/gnutls.rshlibs
@@ -2,10 +2,10 @@ libtasn1.so.3
 libgcrypt.so.11
 libgpg-error.so.0
 libz.so.1
-libdl.so.2
 libpthread.so.0
 libc.so.6
 liblzo2.so.2
 libstdc++.so.6
 libm.so.6
 libgcc_s.so.1
+libp11-kit.so.0
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index c145b8c941..8dc8520fee 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,15 @@
 # Template build file for 'gnutls'.
 pkgname=gnutls
-version=2.12.7
+version=2.12.17
 #distfiles="ftp://ftp.gnutls.org/pub/gnutls/gnutls-$version.tar.bz2"
 distfiles="http://mirror.symnds.com/software/GNU/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-lzo --with-zlib --disable-guile --with-libgcrypt"
-revision=1
 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"
-checksum=77d84fe63a249dcdace421fb9e162cfde9a3f2c7be29007799fcfa2856a87527
+checksum=588ad6b0901c789f2f6afcec88ac4d688801bf1a024c9afa08706bb8d9868bf3
 long_desc="
  GnuTLS is a portable ANSI C based library which implements the TLS 1.0 and
  SSL 3.0 protocols. The library does not include any patented algorithms and
@@ -30,10 +29,11 @@ long_desc="
 
 subpackages="$pkgname-devel $pkgname-tools"
 
-Add_dependency build libgpg-error-devel
-Add_dependency build libstdc++-devel
+Add_dependency build pkg-config
 Add_dependency build zlib-devel
+Add_dependency build lzo-devel
 Add_dependency build readline-devel
+Add_dependency build libgpg-error-devel
 Add_dependency build libtasn1-devel
 Add_dependency build libgcrypt-devel
-Add_dependency build lzo-devel
+Add_dependency build p11-kit-devel