diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index b264110fe39..24128de11e1 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,30 +1,30 @@
-# $OpenBSD: Makefile,v 1.8 2009/03/14 14:47:27 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2009/04/11 13:45:06 martynas Exp $
 
-SHARED_ONLY=		Yes
+SHARED_ONLY =		Yes
 
-COMMENT=		PostgreSQL database adapter for Python
+COMMENT =		PostgreSQL database adapter for Python
 
-MODPY_EGG_VERSION=	2.0.7
-DISTNAME=		psycopg2-${MODPY_EGG_VERSION}
-PKGNAME=		py-${DISTNAME}p0
-CATEGORIES=		databases
+MODPY_EGG_VERSION =	2.0.9
+DISTNAME =		psycopg2-${MODPY_EGG_VERSION}
+PKGNAME =		py-${DISTNAME}
+CATEGORIES =		databases
 
-HOMEPAGE=		http://initd.org/projects/psycopg2
+HOMEPAGE =		http://initd.org/projects/psycopg2
 
-MAINTAINER=		Martynas Venckus <martynas@openbsd.org>
+MAINTAINER =		Martynas Venckus <martynas@openbsd.org>
 
 # GPLv2+
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_DISTFILES_FTP =	Yes
+PERMIT_DISTFILES_CDROM = Yes
 
-MASTER_SITES=	http://initd.org/pub/software/psycopg/
+MASTER_SITES =	http://initd.org/pub/software/psycopg/
 
-MODULES=	lang/python
-LIB_DEPENDS=	pq::databases/postgresql
-RUN_DEPENDS=	:postgresql-client-*:databases/postgresql
-REGRESS_DEPENDS= ${RUN_DEPENDS}
+MODULES =	lang/python
+LIB_DEPENDS =	pq::databases/postgresql
+RUN_DEPENDS =	:postgresql-client-*:databases/postgresql
+REGRESS_DEPENDS = ${RUN_DEPENDS}
 
 # To run the tests, create and start a test database as follows:
 #     createdb psycopg2_test
@@ -34,19 +34,18 @@ REGRESS_DEPENDS= ${RUN_DEPENDS}
 # and should own the database:
 #     echo "ALTER DATABASE psycopg2_test OWNER TO ${USER};" | \
 #         psql -U postgres
-REGRESS_IS_INTERACTIVE=	Yes
-PSYCOPG2_TESTDB?=	psycopg2_test
+REGRESS_IS_INTERACTIVE = Yes
+PSYCOPG2_TESTDB? =	psycopg2_test
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-psycopg2
-	cd ${WRKSRC}/doc && \
-		find . -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-psycopg2/{} \; && \
-		find . ! -type d -exec ${INSTALL_DATA} {} ${PREFIX}/share/doc/py-psycopg2/{} \;
+	cd ${WRKSRC}/doc && pax -rw * ${PREFIX}/share/doc/py-psycopg2/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-psycopg2
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/py-psycopg2/
+	${INSTALL_DATA} ${WRKSRC}/examples/* \
+		${PREFIX}/share/examples/py-psycopg2/
 
 do-regress: fake
 	cd ${WRKSRC}/tests && ${SETENV} "PYTHONPATH=${WRKINST}${MODPY_SITEPKG}:../" \
-	    ${MODPY_BIN} ./runtests.py
+	    ${MODPY_BIN} ./__init__.py
 
 .include <bsd.port.mk>
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index 71e081c4135..4e447fdf5a4 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,5 +1,5 @@
-MD5 (psycopg2-2.0.7.tar.gz) = OaKi7BbwMdK7HFTeQD1Ndw==
-RMD160 (psycopg2-2.0.7.tar.gz) = YDYIedRmgu/gl8Rofe3nUCQ0+v8=
-SHA1 (psycopg2-2.0.7.tar.gz) = tOu1ZDSCiiCeWdsmqlOMUwyIa+U=
-SHA256 (psycopg2-2.0.7.tar.gz) = 2dT2X33hAkSqb0O4mqPuOlSWF7DS4KxsAMz1zPyYIe0=
-SIZE (psycopg2-2.0.7.tar.gz) = 240073
+MD5 (psycopg2-2.0.9.tar.gz) = iF5b03Kvr9FM/ZFLAARi5w==
+RMD160 (psycopg2-2.0.9.tar.gz) = MZT7rhxpo3NOTbkeIdtLaI3h1jA=
+SHA1 (psycopg2-2.0.9.tar.gz) = 1qykuWtpIHp5WTRiPeYOnJzjI3g=
+SHA256 (psycopg2-2.0.9.tar.gz) = O3FVEZgTBjkfBxw5Bp/A70jTF4idk2sK1sfHLWNw2XM=
+SIZE (psycopg2-2.0.9.tar.gz) = 253729
diff --git a/databases/py-psycopg2/pkg/PLIST b/databases/py-psycopg2/pkg/PLIST
index cfb24784a37..ae84fea26d7 100644
--- a/databases/py-psycopg2/pkg/PLIST
+++ b/databases/py-psycopg2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/06/02 17:16:49 wcmaier Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/04/11 13:45:06 martynas Exp $
 lib/python${MODPY_VERSION}/site-packages/psycopg2/
 lib/python${MODPY_VERSION}/site-packages/psycopg2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/psycopg2/__init__.py
@@ -35,6 +35,7 @@ share/examples/py-psycopg2/dt.py
 share/examples/py-psycopg2/encoding.py
 share/examples/py-psycopg2/fetch.py
 share/examples/py-psycopg2/lastrowid.py
+share/examples/py-psycopg2/lobject.py
 share/examples/py-psycopg2/mogrify.py
 share/examples/py-psycopg2/myfirstrecipe.py
 share/examples/py-psycopg2/notify.py