diff --git a/env.py b/env.py
index 9f828b3..87176b1 100644
--- a/env.py
+++ b/env.py
@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 
 from os import environ
-from urlparse import urlparse as _urlparse
+try:
+    from urllib.parse import urlparse as _urlparse
+except ImportError:
+    from urlparse import urlparse as _urlparse
 
 
 def lower_dict(d):
diff --git a/setup.py b/setup.py
index 220f821..de438f9 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ from setuptools import setup
 
 setup(
     name='env',
-    version='0.1.0',
+    version='0.1.1',
     url='https://github.com/kennethreitz/env',
     license='BSD',
     author='Kenneth Reitz',