diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile
index dfccd9732d5..8e2d5011b5e 100644
--- a/databases/py-couchdb/Makefile
+++ b/databases/py-couchdb/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2009/08/01 03:20:19 fgsch Exp $
+# $OpenBSD: Makefile,v 1.4 2009/11/03 00:37:41 fgsch Exp $
 
 COMMENT =	Python library for working with CouchDB
 
 MODPY_EGG_VERSION = 0.6
 DISTNAME =	CouchDB-${MODPY_EGG_VERSION}
-PKGNAME =	py-${DISTNAME}
+PKGNAME =	py-${DISTNAME}p0
 
 CATEGORIES =	databases devel
 
@@ -22,9 +22,21 @@ MODULES =	lang/python
 
 RUN_DEPENDS =	::www/py-httplib2 \
 		::devel/py-simplejson
+REGRESS_DEPENDS = ::databases/apache-couchdb \
+		  :${PKGNAME}:${BASE_PKGPATH}
 
 MODPY_SETUPTOOLS =	Yes
 
-NO_REGRESS =	Yes
+# To run the tests, start apache-couchdb using the default configuration.
+# Alternatively, the tests will use the COUCHDB_URI environment variable
+# to connect to the database.
+REGRESS_IS_INTERACTIVE = Yes
+
+post-install:
+	$(INSTALL_DATA_DIR) ${PREFIX}/share/examples/py-couchdb
+	${SUBST_CMD} -c ${FILESDIR}/python.ini \
+	    ${PREFIX}/share/examples/py-couchdb/python.ini
+	@chown ${SHAREOWN}:${SHAREGRP} \
+	    ${PREFIX}/share/examples/py-couchdb/python.ini
 
 .include <bsd.port.mk>
diff --git a/databases/py-couchdb/files/python.ini b/databases/py-couchdb/files/python.ini
new file mode 100644
index 00000000000..fdbe220e8de
--- /dev/null
+++ b/databases/py-couchdb/files/python.ini
@@ -0,0 +1,4 @@
+; $OpenBSD: python.ini,v 1.1 2009/11/03 00:37:41 fgsch Exp $
+
+[query_servers]
+python = ${TRUEPREFIX}/bin/couchpy
diff --git a/databases/py-couchdb/pkg/PLIST b/databases/py-couchdb/pkg/PLIST
index a67adf7ea85..cb6a1093aff 100644
--- a/databases/py-couchdb/pkg/PLIST
+++ b/databases/py-couchdb/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/08/01 03:20:19 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/11/03 00:37:41 fgsch Exp $
 bin/couchdb-dump
 bin/couchdb-load
 bin/couchdb-replicate
@@ -37,3 +37,8 @@ lib/python${MODPY_VERSION}/site-packages/couchdb/tools/replication_helper_test.p
 lib/python${MODPY_VERSION}/site-packages/couchdb/tools/replication_helper_test.pyc
 lib/python${MODPY_VERSION}/site-packages/couchdb/view.py
 lib/python${MODPY_VERSION}/site-packages/couchdb/view.pyc
+share/examples/py-couchdb/
+share/examples/py-couchdb/python.ini
+@sample ${SYSCONFDIR}/couchdb/
+@sample ${SYSCONFDIR}/couchdb/local.d/
+@sample ${SYSCONFDIR}/couchdb/local.d/python.ini