diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index d9a2fdd303c4..1297f24b49fb 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,24 +1,28 @@
-# $NetBSD: Makefile,v 1.46 2013/10/23 08:35:28 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2013/12/11 19:18:56 wiz Exp $
 
-DISTNAME=	bsddb3-6.0.0
+DISTNAME=	bsddb3-6.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	http://pypi.python.org/packages/source/b/bsddb3/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/bsddb3/
-COMMENT=	Python extension module for Berkeley DB 4
-LICENSE=	mit
+COMMENT=	Python extension module for Berkeley DB 4 and 5
+LICENSE=	modified-bsd
 
 BDB_ACCEPTED=		db4 db5
 
 PYSETUPBUILDARGS=	--berkeley-db=${BDBBASE}
 PYSETUPINSTALLARGS=	--berkeley-db=${BDBBASE}
+PYSETUPBUILDARGS+=	--berkeley-db-incdir=${BDBBASE}/include/${BDB_TYPE}
+PYSETUPINSTALLARGS+=	--berkeley-db-incdir=${BDBBASE}/include/${BDB_TYPE}
 
-PYDISTUTILSPKG=	yes
+PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 REPLACE_PYTHON=		Lib/bsddb/dbshelve.py
 REPLACE_PYTHON+=	Lib3/bsddb/dbshelve.py
+REPLACE_PYTHON+=	Lib/bsddb/test/test_dbtables.py
+REPLACE_PYTHON+=	Lib3/bsddb/test/test_dbtables.py
 
 SUBST_CLASSES+=		bdb
 SUBST_STAGE.bdb=	pre-configure
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index 37484d95bf80..dca5eebd923f 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.22 2013/10/23 08:35:28 wiz Exp $
+$NetBSD: distinfo,v 1.23 2013/12/11 19:18:56 wiz Exp $
 
-SHA1 (bsddb3-6.0.0.tar.gz) = ca5c204b2c9cf4fff396ba3d49994fe1a95d669f
-RMD160 (bsddb3-6.0.0.tar.gz) = 5e33f120cf82d0d7f8b88f7699cd546855b51384
-Size (bsddb3-6.0.0.tar.gz) = 342086 bytes
+SHA1 (bsddb3-6.0.1.tar.gz) = c12e47f7c21b4bc586c68cce64e0079d070312e8
+RMD160 (bsddb3-6.0.1.tar.gz) = ede4858b3bd004653fe024b2eaa97dfb5ab93770
+Size (bsddb3-6.0.1.tar.gz) = 347002 bytes