diff --git a/flask_oauth.py b/flask_oauth.py
index b21105a..7d1b6db 100644
--- a/flask_oauth.py
+++ b/flask_oauth.py
@@ -8,14 +8,21 @@
     :copyright: (c) 2010 by Armin Ronacher.
     :license: BSD, see LICENSE for more details.
 """
+import sys
 import httplib2
 from functools import wraps
-from urlparse import urljoin
 from flask import request, session, json, redirect, Response
 from werkzeug import url_decode, url_encode, url_quote, \
      parse_options_header, Headers
 import oauth2
 
+if (sys.version_info > (3, 0)):
+    # Python3 import
+    from urllib.parse import urljoin
+else:
+    # Python2 import
+    from urlparse import urljoin
+
 
 _etree = None
 def get_etree():