diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index b07adf60608..ebe11eb09d9 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -13,7 +13,10 @@ import pytz
 import re
 import socket
 import time
-import xmlrpclib
+try:
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib
 
 from collections import namedtuple
 from email.message import Message
diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py
index aed6db0681f..7ad0901ef22 100755
--- a/addons/mail/static/scripts/openerp_mailgate.py
+++ b/addons/mail/static/scripts/openerp_mailgate.py
@@ -9,7 +9,10 @@ import cgitb
 import time
 import optparse
 import sys
-import xmlrpclib
+try:
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib
 import smtplib
 from email.mime.multipart import MIMEMultipart
 from email.mime.base import MIMEBase
diff --git a/setup/package.py b/setup/package.py
index fcb174435ac..d7c712aba7e 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -10,7 +10,10 @@ import signal
 import subprocess
 import tempfile
 import time
-import xmlrpclib
+try:
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib
 from contextlib import contextmanager
 from glob import glob
 from os.path import abspath, dirname, join