diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index e8436cd497fb..1e6ea98e7ff6 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	urllib3
-PORTVERSION=	1.8
+PORTVERSION=	1.8.2
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE=	MIT
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYTHON_PY3K_PLIST_HACK=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/py-urllib3/distinfo b/net/py-urllib3/distinfo
index c87bac00cf2d..e13c5525e328 100644
--- a/net/py-urllib3/distinfo
+++ b/net/py-urllib3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (urllib3-1.8.tar.gz) = 1a89fa1b43d277cfadf228cc90b9c75f254818ea3a1aab7bffb0223cbb7bb15d
-SIZE (urllib3-1.8.tar.gz) = 76503
+SHA256 (urllib3-1.8.2.tar.gz) = 6cb6a57764b6b80b3de327bb2ea3082de8663815cab2149b612dc0b2ba70ac05
+SIZE (urllib3-1.8.2.tar.gz) = 102441
diff --git a/net/py-urllib3/pkg-plist b/net/py-urllib3/pkg-plist
deleted file mode 100644
index 9ab24896d00c..000000000000
--- a/net/py-urllib3/pkg-plist
+++ /dev/null
@@ -1,77 +0,0 @@
-%%PYTHON_SITELIBDIR%%/dummyserver/__init__.py
-%%PYTHON_SITELIBDIR%%/dummyserver/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dummyserver/__init__.pyo
-%%PYTHON_SITELIBDIR%%/dummyserver/handlers.py
-%%PYTHON_SITELIBDIR%%/dummyserver/handlers.pyc
-%%PYTHON_SITELIBDIR%%/dummyserver/handlers.pyo
-%%PYTHON_SITELIBDIR%%/dummyserver/proxy.py
-%%PYTHON_SITELIBDIR%%/dummyserver/proxy.pyc
-%%PYTHON_SITELIBDIR%%/dummyserver/proxy.pyo
-%%PYTHON_SITELIBDIR%%/dummyserver/server.py
-%%PYTHON_SITELIBDIR%%/dummyserver/server.pyc
-%%PYTHON_SITELIBDIR%%/dummyserver/server.pyo
-%%PYTHON_SITELIBDIR%%/dummyserver/testcase.py
-%%PYTHON_SITELIBDIR%%/dummyserver/testcase.pyc
-%%PYTHON_SITELIBDIR%%/dummyserver/testcase.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/__init__.py
-%%PYTHON_SITELIBDIR%%/urllib3/__init__.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/__init__.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/_collections.py
-%%PYTHON_SITELIBDIR%%/urllib3/_collections.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/_collections.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/connection.py
-%%PYTHON_SITELIBDIR%%/urllib3/connection.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/connection.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/connectionpool.py
-%%PYTHON_SITELIBDIR%%/urllib3/connectionpool.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/connectionpool.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/urllib3/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/contrib/ntlmpool.py
-%%PYTHON_SITELIBDIR%%/urllib3/contrib/ntlmpool.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/contrib/ntlmpool.pyo
-%%SSL%%%%PYTHON_SITELIBDIR%%/urllib3/contrib/pyopenssl.py
-%%SSL%%%%PYTHON_SITELIBDIR%%/urllib3/contrib/pyopenssl.pyc
-%%SSL%%%%PYTHON_SITELIBDIR%%/urllib3/contrib/pyopenssl.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/exceptions.py
-%%PYTHON_SITELIBDIR%%/urllib3/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/fields.py
-%%PYTHON_SITELIBDIR%%/urllib3/fields.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/fields.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/filepost.py
-%%PYTHON_SITELIBDIR%%/urllib3/filepost.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/filepost.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/packages/__init__.py
-%%PYTHON_SITELIBDIR%%/urllib3/packages/__init__.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/packages/__init__.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/packages/ordered_dict.py
-%%PYTHON_SITELIBDIR%%/urllib3/packages/ordered_dict.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/packages/ordered_dict.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/packages/six.py
-%%PYTHON_SITELIBDIR%%/urllib3/packages/six.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/packages/six.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/__init__.py
-%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/__init__.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/__init__.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/_implementation.py
-%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/_implementation.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/_implementation.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/poolmanager.py
-%%PYTHON_SITELIBDIR%%/urllib3/poolmanager.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/poolmanager.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/request.py
-%%PYTHON_SITELIBDIR%%/urllib3/request.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/request.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/response.py
-%%PYTHON_SITELIBDIR%%/urllib3/response.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/response.pyo
-%%PYTHON_SITELIBDIR%%/urllib3/util.py
-%%PYTHON_SITELIBDIR%%/urllib3/util.pyc
-%%PYTHON_SITELIBDIR%%/urllib3/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname
-@dirrm %%PYTHON_SITELIBDIR%%/urllib3/packages
-@dirrm %%PYTHON_SITELIBDIR%%/urllib3/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/urllib3
-@dirrm %%PYTHON_SITELIBDIR%%/dummyserver