diff --git a/srcpkgs/gnome-keyring-devel b/srcpkgs/gnome-keyring-devel
new file mode 120000
index 0000000000..0e2556accf
--- /dev/null
+++ b/srcpkgs/gnome-keyring-devel
@@ -0,0 +1 @@
+gnome-keyring
\ No newline at end of file
diff --git a/srcpkgs/gnome-keyring/depends b/srcpkgs/gnome-keyring/depends
new file mode 100644
index 0000000000..071d27b792
--- /dev/null
+++ b/srcpkgs/gnome-keyring/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.30.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-keyring/gnome-keyring-devel.template b/srcpkgs/gnome-keyring/gnome-keyring-devel.template
new file mode 100644
index 0000000000..ae7ac2feeb
--- /dev/null
+++ b/srcpkgs/gnome-keyring/gnome-keyring-devel.template
@@ -0,0 +1,32 @@
+# Template file for 'gnome-keyring-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run intltool
+Add_dependency run pam-devel
+Add_dependency run glib-devel
+Add_dependency run libgcrypt-devel
+Add_dependency run libgpg-error-devel
+Add_dependency run libtasn1-devel
+Add_dependency run gtk+-devel
+Add_dependency run atk-devel
+Add_dependency run pango-devel
+Add_dependency run cairo-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run dbus-devel
+Add_dependency run GConf-devel
+Add_dependency run gnome-keyring
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
new file mode 100644
index 0000000000..8183efdc0b
--- /dev/null
+++ b/srcpkgs/gnome-keyring/template
@@ -0,0 +1,52 @@
+# Template file for 'gnome-keyring'
+pkgname=gnome-keyring
+version=2.30.0
+distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var --with-pam-dir=/lib/security
+--with-root-certs=/etc/ssl/certs --disable-schemas-install
+--with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+short_desc="GNOME password and secret manager"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=115551cc564689ded4f9c52793a26e85defbe11a6e019a13723d867d5b03c314
+long_desc="
+ gnome-keyring is a program that keeps passwords and other secrets for
+ users. It is run as a damon in the session, similar to ssh-agent, and
+ other applications can locate it by an environment variable.
+
+ The program can manage several keyrings, each with its own master
+ password, and there is also a session keyring which is never stored to
+ disk, but forgotten when the session ends."
+
+gconf_schemas="gnome-keyring.schemas"
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run pam
+Add_dependency run glib
+Add_dependency run libgcrypt
+Add_dependency run libgpg-error
+Add_dependency run libtasn1
+Add_dependency run gtk+
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run dbus-libs
+Add_dependency run GConf
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build pam-devel
+Add_dependency build glib-devel
+Add_dependency build libgcrypt-devel
+Add_dependency build libgpg-error-devel
+Add_dependency build libtasn1-devel
+Add_dependency build gtk+-devel
+Add_dependency build atk-devel
+Add_dependency build pango-devel
+Add_dependency build cairo-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build dbus-devel
+Add_dependency build GConf-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 28253238c1..0ebf09e151 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -535,3 +535,5 @@ libgnome-menu.so		gnome-menus		gnome-menus-devel
 libart_lgpl_2.so		libart			libart-devel
 libgnomecanvas-2.so		libgnomecanvas		libgnomecanvas-devel
 libbonoboui-2.so		libbonoboui		libbonoboui-devel
+libgp11.so			gnome-keyring		gnome-keyring-devel
+libgcr.so			gnome-keyring		gnome-keyring-devel