diff --git a/www/p5-HTML-CGIChecker/Makefile b/www/p5-HTML-CGIChecker/Makefile
new file mode 100644
index 00000000000..f4273a21412
--- /dev/null
+++ b/www/p5-HTML-CGIChecker/Makefile
@@ -0,0 +1,24 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2001/08/15 06:48:01 shell Exp $
+
+COMMENT=	"perl module to detect dangerous HTML code"
+
+VERSION=	0.90
+DISTNAME=	HTML-CGIChecker-${VERSION}
+PKGNAME=	p5-${DISTNAME}
+CATEGORIES=	www security perl5
+NEED_VERSION=	1.435
+
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR= HTML
+
+MAINTAINER=	Shell Hung <shell@openbsd.org>
+
+
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+CONFIGURE_STYLE= perl
+
+.include <bsd.port.mk>
diff --git a/www/p5-HTML-CGIChecker/files/md5 b/www/p5-HTML-CGIChecker/files/md5
new file mode 100644
index 00000000000..b46919b8642
--- /dev/null
+++ b/www/p5-HTML-CGIChecker/files/md5
@@ -0,0 +1,3 @@
+MD5 (HTML-CGIChecker-0.90.tar.gz) = 4e984ed713ab6f87c42ea773cde2fdcf
+RMD160 (HTML-CGIChecker-0.90.tar.gz) = 2b2d8b6a753039b3d0039673497e1cdf4edea300
+SHA1 (HTML-CGIChecker-0.90.tar.gz) = 4a809c41c9493645296ea026aa5705e84cb56470
diff --git a/www/p5-HTML-CGIChecker/pkg/DESCR b/www/p5-HTML-CGIChecker/pkg/DESCR
new file mode 100644
index 00000000000..40a6ac08df1
--- /dev/null
+++ b/www/p5-HTML-CGIChecker/pkg/DESCR
@@ -0,0 +1,19 @@
+HTML::CGIChecker is a module for web developers to parse HTML and
+to detect HTML code that could break a page in some way.
+
+This module is not a HTML validator, but it allows one to check the
+HTML code that users post to a web application, for example to a
+discussion board, to prevent them to post a piece of code that would
+render the rest of a page it is displayed on unusable.
+
+Using it one also can deny javascripts, images, tables or any other
+tags on an individual basis. It also can check for correct quoting
+and correct URLs.
+
+The module can autocorrect some common bad users' behaviour, for
+example the use of unescaped HTML brackets in a chat room, etc.
+
+It is easy to use and very useful in any CGI application in which
+you want its users to be able to use HTML in their posts to some
+customizable extent. It is object oriented and designed to be easily
+extensible.
diff --git a/www/p5-HTML-CGIChecker/pkg/PLIST b/www/p5-HTML-CGIChecker/pkg/PLIST
new file mode 100644
index 00000000000..46e64511fc1
--- /dev/null
+++ b/www/p5-HTML-CGIChecker/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2001/08/15 06:48:01 shell Exp $
+libdata/perl5/site_perl/HTML/CGIChecker.pm
+man/man3/HTML::CGIChecker.3p