diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 6810b314e3c..3e907871341 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2011/09/16 09:24:56 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2011/12/14 20:25:11 rpointel Exp $
 
 COMMENT=	simplified packaging system for Python modules
 
 MODPY_EGG_VERSION=	0.6c11
 DISTNAME=		setuptools-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME:S/c/./}
-REVISION =		3
+REVISION =		4
 EPOCH = 		0
 CATEGORIES=		devel
 PKG_ARCH=		*
diff --git a/devel/py-setuptools/pkg/PLIST b/devel/py-setuptools/pkg/PLIST
index 03340369b6f..eb1a8b07878 100644
--- a/devel/py-setuptools/pkg/PLIST
+++ b/devel/py-setuptools/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2008/04/15 09:31:47 martynas Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/12/14 20:25:11 rpointel Exp $
+@conflict py-distribute-*
 @comment bin/easy_install
 bin/easy_install-${MODPY_VERSION}
 lib/python${MODPY_VERSION}/site-packages/easy_install.py