diff --git a/common/shlibs b/common/shlibs
index 0e62120538..0e0fd0d885 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1413,3 +1413,4 @@ libixml.so.2 libupnp-1.6.18_1
 libupnp.so.6 libupnp-1.6.18_1
 libmozjs-17.0.so mozjs17-17.0.0_1
 libgeocode-glib.so.0 geocode-glib-3.10.0_1
+libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
diff --git a/srcpkgs/libzeitgeist2 b/srcpkgs/libzeitgeist2
new file mode 120000
index 0000000000..4f138a941b
--- /dev/null
+++ b/srcpkgs/libzeitgeist2
@@ -0,0 +1 @@
+zeitgeist
\ No newline at end of file
diff --git a/srcpkgs/zeitgeist-devel b/srcpkgs/zeitgeist-devel
new file mode 120000
index 0000000000..4f138a941b
--- /dev/null
+++ b/srcpkgs/zeitgeist-devel
@@ -0,0 +1 @@
+zeitgeist
\ No newline at end of file
diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template
index 429c78fbdf..2c7a1cad03 100644
--- a/srcpkgs/zeitgeist/template
+++ b/srcpkgs/zeitgeist/template
@@ -1,16 +1,16 @@
 # Template file for 'zeitgeist'
 pkgname=zeitgeist
-version=0.9.5
+version=0.9.14
 revision=1
 build_style=gnu-configure
-makedepends="pkg-config intltool python-devel vala-devel dbus-devel
- raptor xapian-core-devel python-rdflib"
+hostmakedepends="pkg-config intltool gobject-introspection"
+makedepends="telepathy-glib-devel pygobject-devel>=3.10 vala-devel dbus-devel raptor xapian-core-devel python-rdflib"
 short_desc="logs the users’ activities and events"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://zeitgeist-project.com"
 license="LGPL-2.1"
-distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.bz2"
-checksum=e5ccb75ff705bfb382750c520c29653b6e0f40aeacd30adf233162132114be55
+distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.xz"
+checksum=769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061
 long_desc="
  Zeitgeist is a service which logs the users’ activities and events,
  anywhere from files opened to websites visited and conversations had.
@@ -23,10 +23,29 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }
 
-zeitgeist_package() {
-	pycompile_module="zeitgeist"
-	depends="python>=2.7<3 dbus-python pygobject"
+libzeitgeist2_package() {
+	short_desc+=" - shared library"
 	pkg_install() {
-		vmove usr
+		vmove "usr/lib/*.so.*"
+		vmove usr/lib/girepository-1.0
+	}
+}
+zeitgeist-devel_package() {
+	short_desc+=" - development files"
+	depends="libzeitgeist2>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/vala
+		vmove usr/share/gir-1.0
+	}
+}
+
+zeitgeist_package() {
+	pycompile_module="zeitgeist"
+	depends="python>=2.7<3 dbus-python pygobject>=3.10"
+	pkg_install() {
+		vmove all
 	}
 }