diff --git a/srcpkgs/folks-devel b/srcpkgs/folks-devel
new file mode 120000
index 0000000000..2e04c4e80b
--- /dev/null
+++ b/srcpkgs/folks-devel
@@ -0,0 +1 @@
+folks
\ No newline at end of file
diff --git a/srcpkgs/folks/depends b/srcpkgs/folks/depends
new file mode 100644
index 0000000000..c611d88cf4
--- /dev/null
+++ b/srcpkgs/folks/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.3.6"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/folks/folks-devel.template b/srcpkgs/folks/folks-devel.template
new file mode 100644
index 0000000000..3d8969b9be
--- /dev/null
+++ b/srcpkgs/folks/folks-devel.template
@@ -0,0 +1,26 @@
+# Template file for 'folks-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 glib-devel
+Add_dependency run vala-devel
+Add_dependency run readline-devel
+Add_dependency run libxml2-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run telepathy-glib-devel
+Add_dependency run libgee-devel
+Add_dependency run folks
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/vala ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
new file mode 100644
index 0000000000..dc7ac141ea
--- /dev/null
+++ b/srcpkgs/folks/template
@@ -0,0 +1,36 @@
+# Template file for 'folks'
+pkgname=folks
+version=0.3.6
+distfiles="${GNOME_SITE}/$pkgname/0.3/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--enable-vala"
+short_desc="GObject Library to aggregate people into metacontacts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=274818fcf325cf77b292abddca62745a5a5c56e701b900a8c42e0b8283d4f830
+long_desc="
+ libfolks is a library that aggregates people from multiple sources (eg,
+ Telepathy connection managers and eventually evolution data server, Facebook,
+ etc.) to create metacontacts. It's written in Vala (in part to evaluate Vala).
+ The initial goal is for GObject/C support, though the Vala bindings should
+ basically automatic."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run readline
+Add_dependency run libxml2
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run telepathy-glib
+Add_dependency run libgee
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build vala-devel
+Add_dependency build readline-devel
+Add_dependency build libxml2-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build telepathy-glib-devel
+Add_dependency build libgee-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 201ce8da78..ba518f11a1 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -787,3 +787,6 @@ libgjs-dbus.so			gjs			gjs-devel
 libtelepathy-glib.so		telepathy-glib		telepathy-glib-devel
 libgedit-private.so		gedit			gedit-devel
 libaccountsservice.so		accountsservice		accountsservice-devel
+libgee.so			libgee			libgee-devel
+libfolks.so.21			folks			folks-devel
+libfolks-telepathy.so.21	folks			folks-devel