.../engine/extensions/datasource_registry.py       |    4 ++--
 zeitgeist-daemon                                   |    2 +-
 zeitgeist-daemon.py                                |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_zeitgeist/engine/extensions/datasource_registry.py b/_zeitgeist/engine/extensions/datasource_registry.py
index 17d357f..fea7d85 100644
--- a/_zeitgeist/engine/extensions/datasource_registry.py
+++ b/_zeitgeist/engine/extensions/datasource_registry.py
@@ -23,7 +23,7 @@ import os
 import cPickle as pickle
 import dbus
 import dbus.service
-import gobject
+from gi.repository import GObject
 import logging
 
 from zeitgeist.datamodel import get_timestamp_for_now
@@ -96,7 +96,7 @@ class DataSourceRegistry(Extension, dbus.service.Object):
 		)
 		
 		self._dirty = True
-		gobject.timeout_add(DISK_WRITE_TIMEOUT, self._write_to_disk)
+		GObject.timeout_add(DISK_WRITE_TIMEOUT, self._write_to_disk)
 		
 	def _write_to_disk(self):
 		data = [DataSource.get_plain(datasource) for datasource in
diff --git a/zeitgeist-daemon b/zeitgeist-daemon
index 3f5ae91..c845d10 100755
--- a/zeitgeist-daemon
+++ b/zeitgeist-daemon
@@ -21,7 +21,7 @@
 
 import sys
 import os
-import gobject
+from gi.repository import GObject
 import glib
 import dbus.mainloop.glib
 import gettext
diff --git a/zeitgeist-daemon.py b/zeitgeist-daemon.py
index 1afe89b..dad24fc 100755
--- a/zeitgeist-daemon.py
+++ b/zeitgeist-daemon.py
@@ -21,7 +21,7 @@
 
 import sys
 import os
-import gobject
+from gi.repository import GObject
 import glib
 import dbus.mainloop.glib
 import gettext
@@ -99,7 +99,7 @@ def do_shell_completion(parser):
 def setup_interface():
 	from _zeitgeist.engine.remote import RemoteInterface
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-	mainloop = gobject.MainLoop()
+	mainloop = GObject.MainLoop()
 	return mainloop, RemoteInterface(mainloop = mainloop)
 
 def start_datahub():