diff --git a/src/common/zeroconf/client_zeroconf.py b/src/common/zeroconf/client_zeroconf.py
index f4b98aab98e12b3c95611d294763796463d3d0ff..d189a7d22d109f5d5937ff0c8a31426fa9c48307 100644
--- a/src/common/zeroconf/client_zeroconf.py
+++ b/src/common/zeroconf/client_zeroconf.py
@@ -1,5 +1,5 @@
 
-from common import roster_zeroconf
+from common.zeroconf import roster_zeroconf
 
 class ClientZeroconf:
 	def __init__(self, zeroconf):
diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/src/common/zeroconf/connection_handlers_zeroconf.py
index f0f17b7df562d8ff3b8f113b315528eb1bf20dab..d73c385baf76f99bd2771453dc6b1a1778800eea 100644
--- a/src/common/zeroconf/connection_handlers_zeroconf.py
+++ b/src/common/zeroconf/connection_handlers_zeroconf.py
@@ -26,7 +26,7 @@ import sys
 
 from calendar import timegm
 
-import socks5
+#import socks5
 import common.xmpp
 
 from common import GnuPG
diff --git a/src/common/zeroconf/connection_zeroconf.py b/src/common/zeroconf/connection_zeroconf.py
index b33685e6ca986560638684bcb0cef5069f89be2c..2a3fabfc7ae3e41cf7e19fced691952bb1c2e1ef 100644
--- a/src/common/zeroconf/connection_zeroconf.py
+++ b/src/common/zeroconf/connection_zeroconf.py
@@ -39,9 +39,9 @@ import gobject
 from common import helpers
 from common import gajim
 from common import GnuPG
-from common import zeroconf
-from common import connection_handlers_zeroconf
-from common import client_zeroconf
+from common.zeroconf import zeroconf
+from common.zeroconf import connection_handlers_zeroconf
+from common.zeroconf import client_zeroconf
 from connection_handlers_zeroconf import *
 
 USE_GPG = GnuPG.USE_GPG
diff --git a/src/common/zeroconf/roster_zeroconf.py b/src/common/zeroconf/roster_zeroconf.py
index aeda3fb67a44eb97a664630f4315b4b73a31856a..503b0a2e1805616fde9f2f47081834852e38479c 100644
--- a/src/common/zeroconf/roster_zeroconf.py
+++ b/src/common/zeroconf/roster_zeroconf.py
@@ -1,4 +1,4 @@
-from common import zeroconf
+from common.zeroconf import zeroconf
 
 class Roster:
 	def __init__(self, zeroconf):
diff --git a/src/gajim.py b/src/gajim.py
index 63b5dcb6ce48c0b41208da87908bf8f82db8b97f..35de76b8b6ffe8f5d406af2a396fe131d76e3dcb 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -39,7 +39,7 @@ from chat_control import ChatControlBase
 
 from common import exceptions
 from common import i18n
-from common import connection_zeroconf
+from common.zeroconf import connection_zeroconf
 
 i18n.init()
 _ = i18n._
@@ -1741,7 +1741,7 @@ class Interface:
 		self.register_handlers()
 		for account in gajim.config.get_per('accounts'):
 			if account == 'zeroconf':
-				gajim.connections[account] = common.connection_zeroconf.ConnectionZeroconf(account)
+				gajim.connections[account] = common.zeroconf.connection_zeroconf.ConnectionZeroconf(account)
 			else:
 				gajim.connections[account] = common.connection.Connection(account)