diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index b3917c50d7d..bbd8e147b48 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -1,15 +1,15 @@
 # Template file for 'p11-kit'
 pkgname=p11-kit
-version=0.16.4
-revision=2
+version=0.18.3
+revision=1
 build_style=gnu-configure
-configure_args="--without-system-anchors --with-system-certificates=/etc/ssl/certs"
+configure_args="--with-module-path=/usr/lib/pkcs11 --without-trust-paths"
 short_desc="Provides a way to load and enumerate PKCS#11 modules"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 homepage="http://p11-glue.freedesktop.org"
 distfiles="$homepage/releases/$pkgname-$version.tar.gz"
-checksum=fe0cb3857529eeaf8e74cc6e704d3ffff4146446f15c139e3c38bf438b13d700
+checksum=89679af1bcfa182f475aa79a05a9e1182a28d52c57e8ced2f0e18aa772cf13d4
 long_desc="
  Provides a standard configuration setup for installing PKCS#11 modules in
  such a way that they're discoverable.
@@ -26,7 +26,7 @@ post_install() {
 
 p11-kit-devel_package() {
 	depends="p11-kit>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -37,7 +37,6 @@ p11-kit-devel_package() {
 p11-kit_package() {
 	conf_files="/etc/pkcs11/pkcs11.conf"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }