diff --git a/databases/Makefile b/databases/Makefile
index c3017f4e4fab..b8e1550816c5 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -83,6 +83,7 @@
     SUBDIR += p5-Class-DBI
     SUBDIR += p5-Class-DBI-AbstractSearch
     SUBDIR += p5-Class-DBI-BaseDSN
+    SUBDIR += p5-Class-DBI-FromCGI
     SUBDIR += p5-Class-DBI-Oracle
     SUBDIR += p5-Class-DBI-Pager
     SUBDIR += p5-Class-DBI-Pg
diff --git a/databases/p5-Class-DBI-FromCGI/Makefile b/databases/p5-Class-DBI-FromCGI/Makefile
new file mode 100644
index 000000000000..46a770bd41b2
--- /dev/null
+++ b/databases/p5-Class-DBI-FromCGI/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	p5-Class-DBI-FromCGI
+# Date created:	   21 july 2003
+# Whom:		   mat
+#
+# $FreeBSD$
+#
+
+PORTNAME=	Class-DBI-FromCGI
+PORTVERSION=	0.92
+CATEGORIES=	databases www perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Class
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	mat@FreeBSD.org
+COMMENT=	Update Class::DBI data using CGI::Untaint
+
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	${SITE_PERL}/Class/DBI.pm:${PORTSDIR}/databases/p5-Class-DBI \
+		${SITE_PERL}/CGI/Untaint.pm:${PORTSDIR}/www/p5-CGI-Untaint
+
+PERL_CONFIGURE=	yes
+
+MAN3=		Class::DBI::FromCGI.3
+
+.include <bsd.port.mk>
diff --git a/databases/p5-Class-DBI-FromCGI/distinfo b/databases/p5-Class-DBI-FromCGI/distinfo
new file mode 100644
index 000000000000..a8db00ed56a6
--- /dev/null
+++ b/databases/p5-Class-DBI-FromCGI/distinfo
@@ -0,0 +1 @@
+MD5 (Class-DBI-FromCGI-0.92.tar.gz) = 41d84b29490adc5400b0b417b2b799ab
diff --git a/databases/p5-Class-DBI-FromCGI/pkg-descr b/databases/p5-Class-DBI-FromCGI/pkg-descr
new file mode 100644
index 000000000000..14eafedb1e19
--- /dev/null
+++ b/databases/p5-Class-DBI-FromCGI/pkg-descr
@@ -0,0 +1,18 @@
+Lots of times, Class::DBI is used in web-based applications. (In fact, coupled
+with a templating system that allows you to pass objects, such as
+Template::Toolkit, Class::DBI is very much your friend for these.) 
+
+And, as we all know, one of the most irritating things about writing web-based
+applications is the monotony of writing much of the same stuff over and over
+again. And, where there's monotony there's a tendency to skip over stuff that
+we all know is really important, but is a pain to write - like Taint Checking
+and sensible input validation. (Especially as we can still show a 'working'
+application without it!). So, we now have CGI::Untaint to take care of a lot of
+that for us. 
+
+It so happens that CGI::Untaint also plays well with Class::DBI. All you need
+to do is to 'use Class::DBI::FromCGI' in your class (or in your local
+Class::DBI subclass that all your other classes inherit from. You do do that,
+don't you?). 
+
+WWW: http://search.cpan.org/dist/Class-DBI-FromCGI/
diff --git a/databases/p5-Class-DBI-FromCGI/pkg-plist b/databases/p5-Class-DBI-FromCGI/pkg-plist
new file mode 100644
index 000000000000..6422cf706ab1
--- /dev/null
+++ b/databases/p5-Class-DBI-FromCGI/pkg-plist
@@ -0,0 +1,7 @@
+%%SITE_PERL%%/Class/DBI/FromCGI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromCGI/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromCGI
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true