diff --git a/_extensions/demo_link.py b/_extensions/demo_link.py
index ab607782c..76d29d47c 100644
--- a/_extensions/demo_link.py
+++ b/_extensions/demo_link.py
@@ -1,7 +1,12 @@
 import collections
 import threading
-import urllib
-import xmlrpclib
+import werkzeug
+
+try:
+    import xmlrpclib
+except ImportError:
+    # P3
+    import xmlrpc.client as xmlrpclib
 
 try:
     import Queue
@@ -94,7 +99,7 @@ class Action(Directive):
         external_id = self.arguments[0]
         text = "action button"
         node = nodes.reference(
-            refuri='https://demo.odoo.com?{}'.format(urllib.urlencode({
+            refuri='https://demo.odoo.com?{}'.format(werkzeug.urls.url_encode({
                 'module': external_id
             })),
             classes=['btn', 'btn-primary', 'btn-lg', 'btn-block', 'center-block']
diff --git a/_extensions/github_link.py b/_extensions/github_link.py
index baf301810..806d2b4ae 100644
--- a/_extensions/github_link.py
+++ b/_extensions/github_link.py
@@ -1,7 +1,8 @@
 import inspect
 import importlib
 import os.path
-from urlparse import urlunsplit
+import werkzeug
+
 
 """
 * adds github_link(mode) context variable: provides URL (in relevant mode) of
@@ -81,7 +82,7 @@ def make_github_link(app, path, line=None, mode="blob"):
         path=path,
         mode=mode,
     )
-    return urlunsplit((
+    return werkzeug.urls.url_unparse((
         'https',
         'github.com',
         urlpath,