diff --git a/srcpkgs/p11-kit-devel b/srcpkgs/p11-kit-devel
new file mode 120000
index 00000000000..045935f6d7d
--- /dev/null
+++ b/srcpkgs/p11-kit-devel
@@ -0,0 +1 @@
+p11-kit
\ No newline at end of file
diff --git a/srcpkgs/p11-kit/depends b/srcpkgs/p11-kit/depends
new file mode 100644
index 00000000000..4c0b4c554c1
--- /dev/null
+++ b/srcpkgs/p11-kit/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.7"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/p11-kit/p11-kit-devel.template b/srcpkgs/p11-kit/p11-kit-devel.template
new file mode 100644
index 00000000000..11266bbf6ce
--- /dev/null
+++ b/srcpkgs/p11-kit/p11-kit-devel.template
@@ -0,0 +1,17 @@
+# Template file for 'p11-kit-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glibc-devel
+Add_dependency run p11-kit
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+}
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
new file mode 100644
index 00000000000..e972a2ea98b
--- /dev/null
+++ b/srcpkgs/p11-kit/template
@@ -0,0 +1,26 @@
+# Template file for 'p11-kit'
+pkgname=p11-kit
+version=0.7
+homepage="http://p11-glue.freedesktop.org"
+distfiles="$homepage/releases/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="Provides a way to load and enumerate PKCS#11 modules"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="BSD"
+checksum=965220495d9db38a1f5f8a50812f19f04cd2091f394f5516952de478d83448ee
+long_desc="
+ Provides a standard configuration setup for installing PKCS#11 modules in
+ such a way that they're discoverable.
+
+ Also solves problems with coordinating the use of PKCS#11 by different
+ components or libraries living in the same process."
+
+conf_files="/etc/pkcs11/pkcs11.conf"
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+
+post_install()
+{
+	mv ${DESTDIR}/${conf_files}.example ${DESTDIR}/${conf_files}
+}
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 8736a6c9019..8689919e8b7 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -836,3 +836,4 @@ libcheese-gtk.so.20		cheese			cheese-devel
 libjson.so			json-c			json-c-devel
 libcogl.so			cogl			cogl-devel
 libcogl-pango.so		cogl			cogl-devel
+libp11-kit.so			p11-kit			p11-kit-devel