diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index 9f572ddab03..0d7d703902f 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,19 +1,19 @@
-# $OpenBSD: Makefile,v 1.6 2008/01/13 17:06:31 martynas Exp $
+# $OpenBSD: Makefile,v 1.7 2008/06/02 17:16:49 wcmaier Exp $
 
-SHARED_ONLY=	Yes
+SHARED_ONLY=		Yes
 
-COMMENT=	PostgreSQL database adapter for Python
+COMMENT=		PostgreSQL database adapter for Python
 
-VERSION=	2.0.6
-DISTNAME=	psycopg2-${VERSION}
-PKGNAME=	py-${DISTNAME}
-CATEGORIES=	databases
+MODPY_EGG_VERSION=	2.0.7
+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>
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
@@ -24,10 +24,18 @@ 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}
 
-NO_REGRESS=	Yes
-
-SUBST_VARS=	VERSION
+# To run the tests, create and start a test database as follows:
+#     createdb psycopg2_test
+# The regress target will use the PSYCOPG2_TESTDB environment
+# variable to connect to the database; see below for defaults. The
+# user running the regress test will be used to make the connection
+# and should own the database:
+#     echo "ALTER DATABASE psycopg2_test OWNER TO ${USER};" | \
+#         psql -U postgres
+REGRESS_IS_INTERACTIVE=	Yes
+PSYCOPG2_TESTDB?=	psycopg2_test
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-psycopg2
@@ -37,4 +45,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${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
+
 .include <bsd.port.mk>
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index 7abdb018177..71e081c4135 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,5 +1,5 @@
-MD5 (psycopg2-2.0.6.tar.gz) = 4ipHi46sWvURHOjGl6uqqA==
-RMD160 (psycopg2-2.0.6.tar.gz) = S169ix95ekyBTJcd9Wmm/KCB1Hw=
-SHA1 (psycopg2-2.0.6.tar.gz) = OZwxWjlcGTAFS+0TYF0FXPYgUng=
-SHA256 (psycopg2-2.0.6.tar.gz) = CBDqeaUBPIYg3+WvcJKWO2Nq5j3HK0WKE8bXvF4eVpQ=
-SIZE (psycopg2-2.0.6.tar.gz) = 228129
+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
diff --git a/databases/py-psycopg2/pkg/PLIST b/databases/py-psycopg2/pkg/PLIST
index 996ea437a53..cfb24784a37 100644
--- a/databases/py-psycopg2/pkg/PLIST
+++ b/databases/py-psycopg2/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/01/13 17:06:31 martynas Exp $
+@comment $OpenBSD: PLIST,v 1.3 2008/06/02 17:16:49 wcmaier Exp $
 lib/python${MODPY_VERSION}/site-packages/psycopg2/
-lib/python${MODPY_VERSION}/site-packages/psycopg2-${VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/psycopg2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/psycopg2/__init__.py
 lib/python${MODPY_VERSION}/site-packages/psycopg2/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/psycopg2/_psycopg.so