diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 927f419460aa6..93c547e053108 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2014/06/15 14:17:08 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2014/07/22 10:00:06 wiz Exp $
 
-EGG_VERSION=		5.0.1
+EGG_VERSION=		5.4.1
 DISTNAME=		setuptools-${EGG_VERSION}
 EGG_NAME=		setuptools-${EGG_VERSION}
 PKGNAME=		${PYPKGPREFIX}-setuptools-${EGG_VERSION}
@@ -12,6 +12,8 @@ HOMEPAGE=		https://pypi.python.org/pypi/setuptools
 COMMENT=		New Python packaging system
 LICENSE=		python-software-foundation OR zpl
 
+DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PYDISTUTILSPKG=			yes
 
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX} PYPKGPREFIX=${PYPKGPREFIX}
@@ -30,10 +32,6 @@ PYSETUPINSTALLARGS=	--single-version-externally-managed
 PYSETUPINSTALLARGS+=	--root=/
 .endif
 
-.if ${OPSYS} == "Darwin"
-DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
-
 # upstream often forgets deleting files, and packages on Windows,
 # so permissions are usually wrong
 post-install:
diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index 77f83a3836597..1bf06fe8c494d 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2014/06/15 14:17:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2014/07/22 10:00:06 wiz Exp $
 bin/easy_install-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -118,6 +118,8 @@ ${PYSITELIB}/setuptools/py31compat.pyo
 ${PYSITELIB}/setuptools/sandbox.py
 ${PYSITELIB}/setuptools/sandbox.pyc
 ${PYSITELIB}/setuptools/sandbox.pyo
+${PYSITELIB}/setuptools/script (dev).tmpl
+${PYSITELIB}/setuptools/script.tmpl
 ${PYSITELIB}/setuptools/site-patch.py
 ${PYSITELIB}/setuptools/site-patch.pyc
 ${PYSITELIB}/setuptools/site-patch.pyo
@@ -130,9 +132,6 @@ ${PYSITELIB}/setuptools/svn_utils.pyo
 ${PYSITELIB}/setuptools/tests/__init__.py
 ${PYSITELIB}/setuptools/tests/__init__.pyc
 ${PYSITELIB}/setuptools/tests/__init__.pyo
-${PYSITELIB}/setuptools/tests/doctest.py
-${PYSITELIB}/setuptools/tests/doctest.pyc
-${PYSITELIB}/setuptools/tests/doctest.pyo
 ${PYSITELIB}/setuptools/tests/environment.py
 ${PYSITELIB}/setuptools/tests/environment.pyc
 ${PYSITELIB}/setuptools/tests/environment.pyo
@@ -166,6 +165,9 @@ ${PYSITELIB}/setuptools/tests/test_egg_info.pyo
 ${PYSITELIB}/setuptools/tests/test_find_packages.py
 ${PYSITELIB}/setuptools/tests/test_find_packages.pyc
 ${PYSITELIB}/setuptools/tests/test_find_packages.pyo
+${PYSITELIB}/setuptools/tests/test_integration.py
+${PYSITELIB}/setuptools/tests/test_integration.pyc
+${PYSITELIB}/setuptools/tests/test_integration.pyo
 ${PYSITELIB}/setuptools/tests/test_markerlib.py
 ${PYSITELIB}/setuptools/tests/test_markerlib.pyc
 ${PYSITELIB}/setuptools/tests/test_markerlib.pyo
diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
index 6399574dd5d1a..208698006d6a5 100644
--- a/devel/py-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.28 2014/06/15 14:17:08 wiz Exp $
+$NetBSD: distinfo,v 1.29 2014/07/22 10:00:06 wiz Exp $
 
-SHA1 (setuptools-5.0.1.tar.gz) = 08967022405ee730c7e9605aad5b1354cc76dd67
-RMD160 (setuptools-5.0.1.tar.gz) = 94efed0cfb8bc7b91491b5f6213846bc3c20431e
-Size (setuptools-5.0.1.tar.gz) = 800987 bytes
+SHA1 (setuptools-5.4.1.tar.gz) = 113e5688a7fab03004f7b793aa2f718f949515d0
+RMD160 (setuptools-5.4.1.tar.gz) = 569c2c9155bca469e95307b5492cc67fb099f83d
+Size (setuptools-5.4.1.tar.gz) = 782761 bytes
 SHA1 (patch-setup.py) = be1078e5e2b6e9ec8c859c2c6e2a4a44fe3c2840