diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index bb6af73356d..252bcd02faf 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23
-, intltool, libtool, python, dbus_libs, telepathy_glib
-, gtk3, json_glib, librdf_raptor2, python2Packages, dbus_glib }:
+, intltool, libtool, dbus_libs, telepathy_glib
+, gtk3, json_glib, librdf_raptor2, dbus_glib
+, pythonSupport ? true, python2Packages
+}:
 
 stdenv.mkDerivation rec {
   version = "0.9.15";
@@ -18,7 +20,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
 
   buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool
-                  libtool python dbus_libs telepathy_glib vala_0_23 dbus_glib
+                  libtool dbus_libs telepathy_glib vala_0_23 dbus_glib
                   gtk3 json_glib librdf_raptor2 python2Packages.rdflib ];
 
   prePatch = "patchShebangs .";
@@ -29,6 +31,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postFixup = ''
+  '' + stdenv.lib.optionalString pythonSupport ''
+    moveToOutput lib/${python2Packages.python.libPrefix} "$py"
+  '';
+
+  outputs = [ "out" ] ++ stdenv.lib.optional pythonSupport "py";
+
   meta = with stdenv.lib; {
     description = "A service which logs the users's activities and events";
     homepage = https://launchpad.net/zeitgeist;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86077665670..8af6fa2aaa5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31273,4 +31273,8 @@ in {
       license = licenses.mit;
     };
   };
+
+  zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else
+    (pkgs.zeitgeist.override{python2Packages=self;}).py;
+
 }