diff --git a/client/pypssl/api.py b/client/pypssl/api.py
index 48df9c6..4de1495 100644
--- a/client/pypssl/api.py
+++ b/client/pypssl/api.py
@@ -3,7 +3,10 @@
 
 import requests
 import socket
-from urlparse import urljoin
+try:
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
 import dateutil.parser
 
 
diff --git a/client/setup.py b/client/setup.py
index 51900a6..4af7750 100644
--- a/client/setup.py
+++ b/client/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='pypssl',
-    version='2.0',
+    version='2.1',
     author='Raphaël Vinot',
     author_email='raphael.vinot@circl.lu',
     maintainer='Raphaël Vinot',