diff --git a/pykolab/wap_client/__init__.py b/pykolab/wap_client/__init__.py
--- a/pykolab/wap_client/__init__.py
+++ b/pykolab/wap_client/__init__.py
@@ -1,15 +1,18 @@
 
 import json
+import sys
 try:
     import httplib
 except ImportError:
     import http.client as httplib
-import urllib
-import sys
 try:
     from urlparse import urlparse
 except ImportError:
     from urllib.parse import urlparse
+try:
+    from urllib import urlencode
+except ImportError:
+    from urllib.parse import urlencode
 
 import pykolab
 
@@ -447,7 +450,7 @@
         conn.set_debuglevel(9)
 
     if get is not None:
-        _get = "?%s" % (urllib.urlencode(get))
+        _get = "?%s" % (urlencode(get))
     else:
         _get = ""