diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index 70d9f37dedee..0d69125d7e26 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	DBIx-Class-Schema-Loader
-PORTVERSION=	0.02007
+PORTVERSION=	0.03000
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBIx
@@ -15,27 +15,33 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Dynamic definition of a DBIx::Class::Schema
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.05006:${PORTSDIR}/databases/p5-DBIx-Class \
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		p5-DBI>=1.50:${PORTSDIR}/databases/p5-DBI \
+		p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-Test-Simple>=0.32:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
+		p5-Data-Dump>=1.06:${PORTSDIR}/devel/p5-Data-Dump \
 		p5-UNIVERSAL-require>=0.10:${PORTSDIR}/devel/p5-UNIVERSAL-require \
 		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
+		p5-Lingua-EN-Inflect-Number>=1.1:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
 		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced \
 		p5-Class-Accessor>=0.22:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Class-Data-Accessor>=0.02:${PORTSDIR}/devel/p5-Class-Data-Accessor \
-		p5-Class-C3>=0.09:${PORTSDIR}/devel/p5-Class-C3 \
-		p5-DBI>=1.40:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-SQLite>=1.11:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Simple>=0.32:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		p5-Class-C3>=0.11:${PORTSDIR}/devel/p5-Class-C3 \
+		p5-DBIx-Class>=0.06000:${PORTSDIR}/databases/p5-DBIx-Class \
+		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
 
 PERL_MODBUILD=	yes
 
 MAN3=	DBIx::Class::Schema::Loader.3 \
-	DBIx::Class::Schema::Loader::DB2.3 \
-	DBIx::Class::Schema::Loader::Generic.3 \
-	DBIx::Class::Schema::Loader::Pg.3 \
-	DBIx::Class::Schema::Loader::SQLite.3 \
-	DBIx::Class::Schema::Loader::Writing.3 \
-	DBIx::Class::Schema::Loader::mysql.3
+	DBIx::Class::Schema::Loader::Base.3 \
+	DBIx::Class::Schema::Loader::DBI.3 \
+	DBIx::Class::Schema::Loader::DBI::DB2.3 \
+	DBIx::Class::Schema::Loader::DBI::Pg.3 \
+	DBIx::Class::Schema::Loader::DBI::SQLite.3 \
+	DBIx::Class::Schema::Loader::DBI::Writing.3 \
+	DBIx::Class::Schema::Loader::DBI::mysql.3 \
+	DBIx::Class::Schema::Loader::RelBuilder.3
 
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} <= 500800
diff --git a/databases/p5-DBIx-Class-Schema-Loader/distinfo b/databases/p5-DBIx-Class-Schema-Loader/distinfo
index 5b96b4d08fe8..253099875043 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/distinfo
+++ b/databases/p5-DBIx-Class-Schema-Loader/distinfo
@@ -1,3 +1,3 @@
-MD5 (DBIx-Class-Schema-Loader-0.02007.tar.gz) = 38695af2905d129c8185ebe403658596
-SHA256 (DBIx-Class-Schema-Loader-0.02007.tar.gz) = b775f8eb86ef73cd8e8bd9aa109636a32491c435149a9fda18a3a9fb9b5db091
-SIZE (DBIx-Class-Schema-Loader-0.02007.tar.gz) = 20098
+MD5 (DBIx-Class-Schema-Loader-0.03000.tar.gz) = 757cbe1b641abfbbe16039a3583552f9
+SHA256 (DBIx-Class-Schema-Loader-0.03000.tar.gz) = 8114e053fc18d50133ae39589c077a3cafd0de11eb4af2364a34779f117bacd6
+SIZE (DBIx-Class-Schema-Loader-0.03000.tar.gz) = 29894
diff --git a/databases/p5-DBIx-Class-Schema-Loader/pkg-descr b/databases/p5-DBIx-Class-Schema-Loader/pkg-descr
index 07eb33ad8914..b5e268ea153c 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/pkg-descr
+++ b/databases/p5-DBIx-Class-Schema-Loader/pkg-descr
@@ -1,24 +1,18 @@
 DBIx::Class::Schema::Loader automates the definition of a
-DBIx::Class::Schema by scanning table schemas and setting up columns and
-primary keys.
+DBIx::Class::Schema by scanning database table definitions and setting
+up the columns and primary keys.
 
-DBIx::Class::Schema::Loader supports MySQL, Postgres, SQLite and DB2.
-See DBIx::Class::Schema::Loader::Generic for more, and
-DBIx::Class::Schema::Loader::Writing for notes on writing your own
-db-specific subclass for an unsupported db.
+DBIx::Class::Schema::Loader currently supports DBI for MySQL, Postgres,
+SQLite and DB2.
 
-This module requires DBIx::Class 0.05 or later, and obsoletes
-DBIx::Class::Loader for DBIx::Class version 0.05 and later.
+See DBIx::Class::Schema::Loader::DBI::Writing for notes on writing your
+own vendor-specific subclass for an unsupported DBD driver.
 
-While on the whole, the bare table definitions are fairly straightforward,
-relationship creation is somewhat heuristic, especially in the choosing
-of relationship types, join types, and relationship names.  The relationships
-generated by this module will probably never be as well-defined as
-hand-generated ones.  Because of this, over time a complex project will
-probably wish to migrate off of L<DBIx::Class::Schema::Loader>.
+This module requires DBIx::Class 0.06 or later, and obsoletes the older
+DBIx::Class::Loader.
 
-It is designed more to get you up and running quickly against an existing
-database, or to be effective for simple situations, rather than to be what
-you use in the long term for a complex database/project.
+This module is designed more to get you up and running quickly against
+an existing database, or to be effective for simple situations, rather
+than to be what you use in the long term for a complex database/project.
 
 WWW: http://search.cpan.org/dist/DBIx-Class-Schema-Loader/
diff --git a/databases/p5-DBIx-Class-Schema-Loader/pkg-plist b/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
index fd88446c36c2..4ede7d948301 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
+++ b/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
@@ -1,10 +1,13 @@
 %%SITE_PERL%%/DBIx/Class/Schema/Loader.pm
-%%SITE_PERL%%/DBIx/Class/Schema/Loader/DB2.pm
-%%SITE_PERL%%/DBIx/Class/Schema/Loader/Generic.pm
-%%SITE_PERL%%/DBIx/Class/Schema/Loader/Pg.pm
-%%SITE_PERL%%/DBIx/Class/Schema/Loader/SQLite.pm
-%%SITE_PERL%%/DBIx/Class/Schema/Loader/Writing.pm
-%%SITE_PERL%%/DBIx/Class/Schema/Loader/mysql.pm
+%%SITE_PERL%%/DBIx/Class/Schema/Loader/Base.pm
+%%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI.pm
+%%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/DB2.pm
+%%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/Pg.pm
+%%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/SQLite.pm
+%%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/Writing.pm
+%%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/mysql.pm
+%%SITE_PERL%%/DBIx/Class/Schema/Loader/RelBuilder.pm
+@dirrmtry %%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Schema/Loader
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Schema
 @dirrmtry %%SITE_PERL%%/DBIx/Class