diff --git a/devel/py-simplejson/Makefile b/devel/py-simplejson/Makefile
index 647df325f55..9b959b39325 100644
--- a/devel/py-simplejson/Makefile
+++ b/devel/py-simplejson/Makefile
@@ -1,38 +1,35 @@
-# $OpenBSD: Makefile,v 1.10 2009/03/11 21:47:13 bernd Exp $
+# $OpenBSD: Makefile,v 1.11 2009/03/25 01:32:17 martynas Exp $
 
-COMMENT=		JSON encoder/decoder
+COMMENT =		JSON encoder/decoder
 
-MODPY_EGG_VERSION=	2.0.7
-DISTNAME=		simplejson-${MODPY_EGG_VERSION}
-PKGNAME=		py-${DISTNAME}p0
+MODPY_EGG_VERSION =	2.0.9
+DISTNAME =		simplejson-${MODPY_EGG_VERSION}
+PKGNAME =		py-${DISTNAME}
 
-CATEGORIES=		devel
+CATEGORIES =		devel
 
-HOMEPAGE=		http://undefined.org/python/\#simplejson
+HOMEPAGE =		http://undefined.org/python/\#simplejson
 
-MAINTAINER=		Martynas Venckus <martynas@openbsd.org>
+MAINTAINER =		Martynas Venckus <martynas@openbsd.org>
 
 # MIT
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
 
-MASTER_SITES=		http://cheeseshop.python.org/packages/source/s/simplejson/
+MASTER_SITES =		${MASTER_SITE_PYPI:=s/simplejson/}
 
-MODULES=		lang/python
-REGRESS_DEPENDS=	::devel/py-nose
+MODULES =		lang/python
+REGRESS_DEPENDS =	::devel/py-nose
 
-MODPY_SETUPTOOLS=	Yes
+MODPY_SETUPTOOLS =	Yes
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-simplejson
-	cd ${WRKSRC}/docs && \
-		find . -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-simplejson/{} \; && \
-		find . ! -type d -exec ${INSTALL_DATA} {} ${PREFIX}/share/doc/py-simplejson/{} \;
+	cd ${WRKSRC}/docs && pax -rw * ${PREFIX}/share/doc/py-simplejson
 
 do-regress:
-	cd ${WRKSRC} && ${MODPY_BIN} -c \
-		'import simplejson.tests; simplejson.tests.main()'
+	cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests
 
 .include <bsd.port.mk>
diff --git a/devel/py-simplejson/distinfo b/devel/py-simplejson/distinfo
index d964ce4f434..e291000e670 100644
--- a/devel/py-simplejson/distinfo
+++ b/devel/py-simplejson/distinfo
@@ -1,5 +1,5 @@
-MD5 (simplejson-2.0.7.tar.gz) = nQInP4YVuOP87aiR//8Q0Q==
-RMD160 (simplejson-2.0.7.tar.gz) = IgRj3/MuQMq6DOuswml+2CWhdRI=
-SHA1 (simplejson-2.0.7.tar.gz) = XDrIgCqkLmPQV7vQJAhlk9wjPc4=
-SHA256 (simplejson-2.0.7.tar.gz) = KzSe1zVA+M5ovfop4I49/52IUCe/oG1qhxoJ/jgd274=
-SIZE (simplejson-2.0.7.tar.gz) = 114982
+MD5 (simplejson-2.0.9.tar.gz) = r15no5yjQIVjQR01fm1eRw==
+RMD160 (simplejson-2.0.9.tar.gz) = gUoLeqEaNhul7aC+k+MFBcRECa0=
+SHA1 (simplejson-2.0.9.tar.gz) = tbJgWa2+Z3sGwpm+0wVX/LDH34w=
+SHA256 (simplejson-2.0.9.tar.gz) = q830YHeL7/SLoT+vW1gQzzgD5cjYcrX8UpImqlbsk+4=
+SIZE (simplejson-2.0.9.tar.gz) = 115443