diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template
index ab60ad89a31..d1c43707f6e 100644
--- a/srcpkgs/zeitgeist/template
+++ b/srcpkgs/zeitgeist/template
@@ -1,15 +1,14 @@
 # Template file for 'zeitgeist'
 pkgname=zeitgeist
 version=0.9.14
-revision=6
+revision=7
 build_style=gnu-configure
-configure_args="--enable-fts --enable-datahub"
-hostmakedepends="pkg-config intltool"
+configure_args="--enable-fts --enable-datahub $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config intltool vala-devel>=0.26 $(vopt_if gir gobject-introspection)"
 makedepends="
  python-rdflib json-glib-devel>=0.16.2 gtk+3-devel telepathy-glib-devel
- python-gobject-devel>=3.10 vala-devel dbus-devel sqlite-devel raptor
- xapian-core-devel"
-depends="python>=2.7<3 python-dbus python-gobject>=3.10"
+ python-gobject-devel>=3.10 dbus-devel sqlite-devel xapian-core-devel raptor"
+depends="python-dbus python-gobject"
 pycompile_module="zeitgeist"
 short_desc="logs the users’ activities and events"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -25,13 +24,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	makedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }