diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index f61a4eac02e..689343ad302 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.7 2008/02/29 17:19:05 merdely Exp $
+# $OpenBSD: Makefile,v 1.8 2008/04/15 09:31:47 martynas Exp $
 
 COMMENT=	simplified packaging system for Python modules
 
-DISTNAME=	setuptools-0.6c7
-PKGNAME=	py-${DISTNAME}p0
-CATEGORIES=	devel
-PKG_ARCH=	*
+MODPY_EGG_VERSION=	0.6c8
+DISTNAME=		setuptools-${MODPY_EGG_VERSION}
+PKGNAME=		py-${DISTNAME}
+CATEGORIES=		devel
+PKG_ARCH=		*
 
 MAINTAINER=	Damien Miller <djm@openbsd.org>
 
diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
index ca2c5c318eb..f9a8f385d4c 100644
--- a/devel/py-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
@@ -1,5 +1,5 @@
-MD5 (setuptools-0.6c7.tar.gz) = 3tv2pPcc1t6vE+6IUFTxaw==
-RMD160 (setuptools-0.6c7.tar.gz) = 7d6S74exMT3jjrriqTnvlxB3bZ0=
-SHA1 (setuptools-0.6c7.tar.gz) = i6pNEb1zgMyrXH+99vjcEqXay6k=
-SHA256 (setuptools-0.6c7.tar.gz) = 8YwwrogCW8lOBOuPiTVXQttgHqA2eZGg4rafK/dOwOc=
-SIZE (setuptools-0.6c7.tar.gz) = 249245
+MD5 (setuptools-0.6c8.tar.gz) = Dpu+FGbz7ilYjMCdMhGgEA==
+RMD160 (setuptools-0.6c8.tar.gz) = CB9J3M764I1Z+QXQdK0V00jVFSc=
+SHA1 (setuptools-0.6c8.tar.gz) = 28eklVZylkwcZWrkynNs9mFAnQY=
+SHA256 (setuptools-0.6c8.tar.gz) = lmZ6hM2MevEDygf+a0H3wUlKCrcwAzX3qxirScMgPjc=
+SIZE (setuptools-0.6c8.tar.gz) = 250878
diff --git a/devel/py-setuptools/patches/patch-setuptools_command_build_ext_py b/devel/py-setuptools/patches/patch-setuptools_command_build_ext_py
deleted file mode 100644
index de4d84e5aa0..00000000000
--- a/devel/py-setuptools/patches/patch-setuptools_command_build_ext_py
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setuptools_command_build_ext_py,v 1.1 2008/02/29 17:19:05 merdely Exp $
---- setuptools/command/build_ext.py.orig	Thu Feb 28 17:28:13 2008
-+++ setuptools/command/build_ext.py	Thu Feb 28 17:28:33 2008
-@@ -70,7 +70,7 @@ class build_ext(_build_ext):
-                 self.write_stub(package_dir or os.curdir, ext, True)
- 
- 
--    if _build_ext is not _du_build_ext:
-+    if _build_ext is not _du_build_ext and not hasattr(_build_ext,'pyrex_sources'):
-         # Workaround for problems using some Pyrex versions w/SWIG and/or 2.4
-         def swig_sources(self, sources, *otherargs):
-             # first do any Pyrex processing
diff --git a/devel/py-setuptools/pkg/PLIST b/devel/py-setuptools/pkg/PLIST
index 56aac4418f0..03340369b6f 100644
--- a/devel/py-setuptools/pkg/PLIST
+++ b/devel/py-setuptools/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2008/01/13 20:51:24 martynas Exp $
+@comment $OpenBSD: PLIST,v 1.5 2008/04/15 09:31:47 martynas Exp $
 @comment bin/easy_install
 bin/easy_install-${MODPY_VERSION}
 lib/python${MODPY_VERSION}/site-packages/easy_install.py
@@ -6,13 +6,13 @@ lib/python${MODPY_VERSION}/site-packages/easy_install.pyc
 lib/python${MODPY_VERSION}/site-packages/pkg_resources.py
 lib/python${MODPY_VERSION}/site-packages/pkg_resources.pyc
 lib/python${MODPY_VERSION}/site-packages/setuptools/
-lib/python${MODPY_VERSION}/site-packages/setuptools-0.6c7-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/setuptools-0.6c7-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/setuptools-0.6c7-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/setuptools-0.6c7-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/setuptools-0.6c7-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/setuptools-0.6c7-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/setuptools-0.6c7-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/setuptools/__init__.py
 lib/python${MODPY_VERSION}/site-packages/setuptools/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/setuptools/archive_util.py