diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index cfba827b78120..b4a07d2744d78 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.90 2016/02/14 10:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2016/03/03 13:01:11 wiz Exp $
 
-DISTNAME=		setuptools-20.1.1
+DISTNAME=		setuptools-20.2.2
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		devel python
 MASTER_SITES=		${MASTER_SITE_PYPI:=s/setuptools/}
diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index 23d1a61768ba5..9da83d76c2aa1 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2016/02/14 10:53:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.29 2016/03/03 13:01:11 wiz Exp $
 bin/easy_install-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
@@ -7,12 +7,6 @@ ${PYSITELIB}/${EGG_FILE}/entry_points.txt
 ${PYSITELIB}/${EGG_FILE}/requires.txt
 ${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/${EGG_FILE}/zip-safe
-${PYSITELIB}/_markerlib/__init__.py
-${PYSITELIB}/_markerlib/__init__.pyc
-${PYSITELIB}/_markerlib/__init__.pyo
-${PYSITELIB}/_markerlib/markers.py
-${PYSITELIB}/_markerlib/markers.pyc
-${PYSITELIB}/_markerlib/markers.pyo
 ${PYSITELIB}/easy_install.py
 ${PYSITELIB}/easy_install.pyc
 ${PYSITELIB}/easy_install.pyo
@@ -34,12 +28,24 @@ ${PYSITELIB}/pkg_resources/_vendor/packaging/_compat.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_structures.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_structures.pyc
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_structures.pyo
+${PYSITELIB}/pkg_resources/_vendor/packaging/markers.py
+${PYSITELIB}/pkg_resources/_vendor/packaging/markers.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/markers.pyo
+${PYSITELIB}/pkg_resources/_vendor/packaging/requirements.py
+${PYSITELIB}/pkg_resources/_vendor/packaging/requirements.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/requirements.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/specifiers.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/specifiers.pyc
 ${PYSITELIB}/pkg_resources/_vendor/packaging/specifiers.pyo
+${PYSITELIB}/pkg_resources/_vendor/packaging/utils.py
+${PYSITELIB}/pkg_resources/_vendor/packaging/utils.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/utils.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/version.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/version.pyc
 ${PYSITELIB}/pkg_resources/_vendor/packaging/version.pyo
+${PYSITELIB}/pkg_resources/_vendor/pyparsing.py
+${PYSITELIB}/pkg_resources/_vendor/pyparsing.pyc
+${PYSITELIB}/pkg_resources/_vendor/pyparsing.pyo
 ${PYSITELIB}/pkg_resources/_vendor/six.py
 ${PYSITELIB}/pkg_resources/_vendor/six.pyc
 ${PYSITELIB}/pkg_resources/_vendor/six.pyo
diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
index e5beb1c91a738..f2d4e44b53f96 100644
--- a/devel/py-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.71 2016/02/14 10:53:17 wiz Exp $
+$NetBSD: distinfo,v 1.72 2016/03/03 13:01:11 wiz Exp $
 
-SHA1 (setuptools-20.1.1.tar.gz) = bb2774945cdbf1137772d81993b4d41d15e9a0a6
-RMD160 (setuptools-20.1.1.tar.gz) = f139b3953c3e4e48be1db64315e43962ddb2309c
-SHA512 (setuptools-20.1.1.tar.gz) = 72da2f5a4e07c14975b3e13246264cb4b9eb52bd6da22fce0ef0f0bb8d902249067e6c23bf263cda45de92a0cdb794f454dff95e52505045e03c7a6ab28cb2ca
-Size (setuptools-20.1.1.tar.gz) = 641777 bytes
+SHA1 (setuptools-20.2.2.tar.gz) = 9350ce6a92ec5d4cfdac487b6612400a6069e0ab
+RMD160 (setuptools-20.2.2.tar.gz) = da9c6148542c88a5054b7f8180891fa1b5991aee
+SHA512 (setuptools-20.2.2.tar.gz) = e74004e5755e1abd9e6efb94887c9124a36e67651e6e626424e96575cf8e84a258d48ee6fa8f0389f15de3bddcbcb0a690810dd46c358f85659ad6f20f905a2d
+Size (setuptools-20.2.2.tar.gz) = 676284 bytes
 SHA1 (patch-setup.py) = be1078e5e2b6e9ec8c859c2c6e2a4a44fe3c2840