diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 344b5ac935..43b8d4f77a 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,19 +1,21 @@
 # Template file for 'folks'
 pkgname=folks
-version=0.9.1
-revision=2
+version=0.9.5
+revision=1
 build_style=gnu-configure
-configure_args="--enable-vala --enable-tracker-backend"
+configure_args="--disable-static --disable-fatal-warnings --enable-eds-backend
+ --enable-vala --enable-inspect-tool --enable-tracker-backend
+ --disable-libsocialweb-backend --disable-schemas-compile"
 hostmakedepends="pkg-config intltool which gobject-introspection"
-makedepends="dbus-glib-devel telepathy-glib-devel>=0.19.9 libgee08-devel>=0.10
- libsocialweb-devel evolution-data-server-devel>=3.8.0 tracker-devel>=0.16
- libzeitgeist-devel"
+# XXX needs zeitgeist >= 2.0
+makedepends="readline-devel vala-devel>=0.22 telepathy-glib-devel>=0.21
+ libgee08-devel>=0.12 evolution-data-server-devel>=3.10 tracker-devel>=0.16_2"
 short_desc="GObject Library to aggregate people into metacontacts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://telepathy.freedesktop.org/wiki/Folks"
 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
-checksum=102b1867355d16e73a837871a058dda13c74fa385908ddda1623893ab0baee4a
+checksum=924c440f16a8c9b0d0d832588fa77a1553fa2a5d2659c4c7d3178a7ef42222af
 long_desc="
  libfolks is a library that aggregates people from multiple sources (eg,
  Telepathy connection managers and eventually evolution data server, Facebook,
@@ -21,21 +23,28 @@ long_desc="
  The initial goal is for GObject/C support, though the Vala bindings should
  basically automatic."
 
+pre_build() {
+	export PKG_CONFIG_PATH="${wrksrc}/folks"
+}
+
 folks-devel_package() {
-	depends="telepathy-glib-devel>=0.19.9 libgee08-devel>=0.10 libsocialweb-devel
-		evolution-data-server-devel>=3.8.0 folks>=${version}"
-	short_desc="${short_desc} - development files"
+	depends="telepathy-glib-devel>=0.21
+		 libgee08-devel>=0.12
+		 evolution-data-server-devel>=3.10
+		 folks>=${version}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
+		vmove "usr/lib/*.so"
 	}
 }
 
 folks_package() {
 	depends="zeitgeist"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }