diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index 424ef447c51..b2063029b5c 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.55 2010/12/03 11:44:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.56 2011/06/27 18:35:44 jasper Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	unified perl interface for database access
 
 MODULES=	cpan
-DISTNAME=	DBI-1.609
-REVISION=	1
+DISTNAME=	DBI-1.616
 CATEGORIES=	databases
-USE_GROFF =	Yes
+USE_GROFF=	Yes
 
 HOMEPAGE=	http://dbi.perl.org/
 MAINTAINER=	Simon Bertrang <simon@openbsd.org>
@@ -19,7 +18,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=	net/p5-PlRPC>=0.2017
+RUN_DEPENDS=	net/p5-PlRPC>=0.2017 \
+		databases/p5-SQL-Statement>=1.28 \
+		devel/p5-MLDBM
 BUILD_DEPENDS=	${RUN_DEPENDS}
 REGRESS_DEPENDS=devel/p5-Test-Pod-Coverage
 
diff --git a/databases/p5-DBI/distinfo b/databases/p5-DBI/distinfo
index da40797cd4d..71722b86b5a 100644
--- a/databases/p5-DBI/distinfo
+++ b/databases/p5-DBI/distinfo
@@ -1,5 +1,5 @@
-MD5 (DBI-1.609.tar.gz) = 5GiYcLP3zlAwIqB2xTKE7Q==
-RMD160 (DBI-1.609.tar.gz) = Hx6P+3lRaMZa3SrBPTVJq5lYuTQ=
-SHA1 (DBI-1.609.tar.gz) = q7gHGjRRw2CZhG9zg4y3plM+O9g=
-SHA256 (DBI-1.609.tar.gz) = m5toj+ZeZ0oMF9k/UE9U1Sve1kl9my2KCqCbZCJq1kE=
-SIZE (DBI-1.609.tar.gz) = 510309
+MD5 (DBI-1.616.tar.gz) = eZMT5UppO+tjW0eRhFj3xA==
+RMD160 (DBI-1.616.tar.gz) = 3fzRVFRveOFST2AjVsIJ7Hl1pGQ=
+SHA1 (DBI-1.616.tar.gz) = 2Wm+uVPDn4F/IyncymKT71sEi1A=
+SHA256 (DBI-1.616.tar.gz) = YM45hsRtEuDq5t74tIBKkO3QLCzGsNJIGFTm242Z0FQ=
+SIZE (DBI-1.616.tar.gz) = 576803
diff --git a/databases/p5-DBI/pkg/PLIST b/databases/p5-DBI/pkg/PLIST
index 69d93de40a3..433a9f85c18 100644
--- a/databases/p5-DBI/pkg/PLIST
+++ b/databases/p5-DBI/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.30 2008/06/01 20:25:50 simon Exp $
+@comment $OpenBSD: PLIST,v 1.31 2011/06/27 18:35:44 jasper Exp $
 bin/dbilogstrip
 bin/dbiprof
 bin/dbiproxy
@@ -8,7 +8,11 @@ ${P5ARCH}/Bundle/DBI.pm
 ${P5ARCH}/DBD/
 ${P5ARCH}/DBD/DBM.pm
 ${P5ARCH}/DBD/ExampleP.pm
+${P5ARCH}/DBD/File/
 ${P5ARCH}/DBD/File.pm
+${P5ARCH}/DBD/File/Developers.pod
+${P5ARCH}/DBD/File/HowTo.pod
+${P5ARCH}/DBD/File/Roadmap.pod
 ${P5ARCH}/DBD/Gofer/
 ${P5ARCH}/DBD/Gofer.pm
 ${P5ARCH}/DBD/Gofer/Policy/
@@ -18,6 +22,7 @@ ${P5ARCH}/DBD/Gofer/Policy/pedantic.pm
 ${P5ARCH}/DBD/Gofer/Policy/rush.pm
 ${P5ARCH}/DBD/Gofer/Transport/
 ${P5ARCH}/DBD/Gofer/Transport/Base.pm
+${P5ARCH}/DBD/Gofer/Transport/corostream.pm
 ${P5ARCH}/DBD/Gofer/Transport/null.pm
 ${P5ARCH}/DBD/Gofer/Transport/pipeone.pm
 ${P5ARCH}/DBD/Gofer/Transport/stream.pm
@@ -36,6 +41,10 @@ ${P5ARCH}/DBI/Const/GetInfoType.pm
 ${P5ARCH}/DBI/DBD/
 ${P5ARCH}/DBI/DBD.pm
 ${P5ARCH}/DBI/DBD/Metadata.pm
+${P5ARCH}/DBI/DBD/SqlEngine/
+${P5ARCH}/DBI/DBD/SqlEngine.pm
+${P5ARCH}/DBI/DBD/SqlEngine/Developers.pod
+${P5ARCH}/DBI/DBD/SqlEngine/HowTo.pod
 ${P5ARCH}/DBI/FAQ.pm
 ${P5ARCH}/DBI/Gofer/
 ${P5ARCH}/DBI/Gofer/Execute.pm
@@ -57,15 +66,12 @@ ${P5ARCH}/DBI/ProfileDumper/Apache.pm
 ${P5ARCH}/DBI/ProfileSubs.pm
 ${P5ARCH}/DBI/ProxyServer.pm
 ${P5ARCH}/DBI/PurePerl.pm
-${P5ARCH}/DBI/Roadmap.pm
 ${P5ARCH}/DBI/SQL/
 ${P5ARCH}/DBI/SQL/Nano.pm
 ${P5ARCH}/DBI/Util/
 ${P5ARCH}/DBI/Util/CacheMemory.pm
 ${P5ARCH}/DBI/Util/_accessor.pm
 ${P5ARCH}/DBI/W32ODBC.pm
-@comment ${P5ARCH}/Roadmap.pod
-@comment ${P5ARCH}/TASKS.pod
 ${P5ARCH}/Win32/
 ${P5ARCH}/Win32/DBIODBC.pm
 ${P5ARCH}/auto/
@@ -87,12 +93,16 @@ ${P5ARCH}/dbixs_rev.pl
 @man man/man3p/Bundle::DBI.3p
 @man man/man3p/DBD::DBM.3p
 @man man/man3p/DBD::File.3p
+@man man/man3p/DBD::File::Developers.3p
+@man man/man3p/DBD::File::HowTo.3p
+@man man/man3p/DBD::File::Roadmap.3p
 @man man/man3p/DBD::Gofer.3p
 @man man/man3p/DBD::Gofer::Policy::Base.3p
 @man man/man3p/DBD::Gofer::Policy::classic.3p
 @man man/man3p/DBD::Gofer::Policy::pedantic.3p
 @man man/man3p/DBD::Gofer::Policy::rush.3p
 @man man/man3p/DBD::Gofer::Transport::Base.3p
+@man man/man3p/DBD::Gofer::Transport::corostream.3p
 @man man/man3p/DBD::Gofer::Transport::null.3p
 @man man/man3p/DBD::Gofer::Transport::pipeone.3p
 @man man/man3p/DBD::Gofer::Transport::stream.3p
@@ -105,6 +115,9 @@ ${P5ARCH}/dbixs_rev.pl
 @man man/man3p/DBI::Const::GetInfoType.3p
 @man man/man3p/DBI::DBD.3p
 @man man/man3p/DBI::DBD::Metadata.3p
+@man man/man3p/DBI::DBD::SqlEngine.3p
+@man man/man3p/DBI::DBD::SqlEngine::Developers.3p
+@man man/man3p/DBI::DBD::SqlEngine::HowTo.3p
 @man man/man3p/DBI::FAQ.3p
 @man man/man3p/DBI::Gofer::Execute.3p
 @man man/man3p/DBI::Gofer::Request.3p
@@ -125,6 +138,4 @@ ${P5ARCH}/dbixs_rev.pl
 @man man/man3p/DBI::SQL::Nano.3p
 @man man/man3p/DBI::Util::CacheMemory.3p
 @man man/man3p/DBI::W32ODBC.3p
-@comment @man man/man3p/Roadmap.3p
-@comment @man man/man3p/TASKS.3p
 @man man/man3p/Win32::DBIODBC.3p