diff --git a/plugins/dbus_plugin/plugin.py b/plugins/dbus_plugin/plugin.py
index 95d3b1760..43f3840e8 100644
--- a/plugins/dbus_plugin/plugin.py
+++ b/plugins/dbus_plugin/plugin.py
@@ -48,7 +48,6 @@ if dbus_support.supported:
         SERVICE = 'org.gajim.dbusplugin'
 
         import dbus.service
-        import dbus.glib
         # type mapping
 
         # in most cases it is a utf-8 string
diff --git a/src/common/dbus_support.py b/src/common/dbus_support.py
index 6cc90102b..12a3ed163 100644
--- a/src/common/dbus_support.py
+++ b/src/common/dbus_support.py
@@ -33,7 +33,8 @@ _GAJIM_ERROR_IFACE = 'org.gajim.dbus.Error'
 
 try:
     import dbus
-    import dbus.glib
+    from dbus.mainloop.glib import DBusGMainLoop
+    DBusGMainLoop(set_as_default=True)
 except ImportError:
     supported = False
     if not os.name == 'nt': # only say that to non Windows users
diff --git a/src/common/location_listener.py b/src/common/location_listener.py
index 07aa11e68..0404a1698 100644
--- a/src/common/location_listener.py
+++ b/src/common/location_listener.py
@@ -25,7 +25,6 @@ from common import pep
 from common import dbus_support
 if dbus_support.supported:
     import dbus
-    import dbus.glib
 
 class LocationListener:
     _instance = None
diff --git a/src/common/zeroconf/zeroconf_avahi.py b/src/common/zeroconf/zeroconf_avahi.py
index 160978d51..5ce4f8398 100644
--- a/src/common/zeroconf/zeroconf_avahi.py
+++ b/src/common/zeroconf/zeroconf_avahi.py
@@ -21,7 +21,6 @@ import logging
 log = logging.getLogger('gajim.c.z.zeroconf_avahi')
 
 try:
-    import dbus.glib
     import dbus.exceptions
 except ImportError, e:
     pass
diff --git a/src/music_track_listener.py b/src/music_track_listener.py
index bb2427c4a..c0910d7e3 100644
--- a/src/music_track_listener.py
+++ b/src/music_track_listener.py
@@ -31,7 +31,6 @@ if __name__ == '__main__':
 from common import dbus_support
 if dbus_support.supported:
     import dbus
-    import dbus.glib
 
 class MusicTrackInfo(object):
     __slots__ = ['title', 'album', 'artist', 'duration', 'track_number',
diff --git a/src/network_manager_listener.py b/src/network_manager_listener.py
index ccb44ee83..41681cb5d 100644
--- a/src/network_manager_listener.py
+++ b/src/network_manager_listener.py
@@ -64,7 +64,6 @@ from common import dbus_support
 
 if dbus_support.supported:
     import dbus
-    import dbus.glib
 
     try:
         from common.dbus_support import system_bus
diff --git a/src/notify.py b/src/notify.py
index b214caf8b..78b31f6a7 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -41,7 +41,6 @@ from common import ged
 from common import dbus_support
 if dbus_support.supported:
     import dbus
-    import dbus.glib
 
 
 USER_HAS_PYNOTIFY = True # user has pynotify module
diff --git a/src/remote_control.py b/src/remote_control.py
index 25160eb4f..eada36668 100644
--- a/src/remote_control.py
+++ b/src/remote_control.py
@@ -43,7 +43,6 @@ if dbus_support.supported:
     import dbus
     if dbus_support:
         import dbus.service
-        import dbus.glib
 
 INTERFACE = 'org.gajim.dbus.RemoteInterface'
 OBJ_PATH = '/org/gajim/dbus/RemoteObject'
diff --git a/src/upower_listener.py b/src/upower_listener.py
index e5b489d57..e514f2e89 100644
--- a/src/upower_listener.py
+++ b/src/upower_listener.py
@@ -34,7 +34,6 @@ def on_suspend(*args, **kwargs):
 
 if dbus_support.supported:
     import dbus
-    import dbus.glib
 
     try:
         from common.dbus_support import system_bus
@@ -47,4 +46,4 @@ if dbus_support.supported:
                 '/org/freedesktop/UPower')
             supported = True
     except Exception:
-        pass
\ No newline at end of file
+        pass