diff --git a/www/Makefile b/www/Makefile
index e561a83cc333..c60f19480544 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -460,6 +460,7 @@
     SUBDIR += p5-HTTPD-Log-Filter
     SUBDIR += p5-HTTPD-Tools
     SUBDIR += p5-IMDB-Movie
+    SUBDIR += p5-MasonX-Apache2Handler
     SUBDIR += p5-MasonX-Interp-WithCallbacks
     SUBDIR += p5-MasonX-Request-WithApacheSession
     SUBDIR += p5-Maypole
diff --git a/www/p5-MasonX-Apache2Handler/Makefile b/www/p5-MasonX-Apache2Handler/Makefile
new file mode 100644
index 000000000000..44f2bad52127
--- /dev/null
+++ b/www/p5-MasonX-Apache2Handler/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for:	www/p5-MasonX-Apache2Handler
+# Date created:				June 5, 2004
+# Whom:	      				Autrijus Tang <autrijus@autrijus.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	MasonX-Apache2Handler
+PORTVERSION=	0.05
+CATEGORIES=	www perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	MasonX
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	autrijus@autrijus.org
+COMMENT=	Mason/mod_perl2 interface
+
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache2:${PORTSDIR}/www/mod_perl2 \
+		${SITE_PERL}/${PERL_ARCH}/Apache2/Apache/Cookie.pm:${PORTSDIR}/www/p5-libapreq2 \
+		${SITE_PERL}/HTML/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason
+
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+PERL_CONFIGURE=	yes
+
+MAN3=		MasonX::Apache2Handler.3 MasonX::Mason-with-mod_perl2.3
+
+.include <bsd.port.mk>
diff --git a/www/p5-MasonX-Apache2Handler/distinfo b/www/p5-MasonX-Apache2Handler/distinfo
new file mode 100644
index 000000000000..80749d534f06
--- /dev/null
+++ b/www/p5-MasonX-Apache2Handler/distinfo
@@ -0,0 +1,2 @@
+MD5 (MasonX-Apache2Handler-0.05.tar.gz) = 64fbb393e3e9a3a28e39827e74e9b11d
+SIZE (MasonX-Apache2Handler-0.05.tar.gz) = 74113
diff --git a/www/p5-MasonX-Apache2Handler/pkg-descr b/www/p5-MasonX-Apache2Handler/pkg-descr
new file mode 100644
index 000000000000..a94373dfa949
--- /dev/null
+++ b/www/p5-MasonX-Apache2Handler/pkg-descr
@@ -0,0 +1,7 @@
+MasonX::Apache2Handler is a Mason add-on which allows Mason to run
+in a pure mod_perl2 environment.
+
+Author: Beau E. Cox
+WWW:	http://search.cpan.org/dist/MasonX-Apache2Handler/
+
+--- Autrijus Tang <autrijus@autrijus.org>
diff --git a/www/p5-MasonX-Apache2Handler/pkg-plist b/www/p5-MasonX-Apache2Handler/pkg-plist
new file mode 100644
index 000000000000..39aaa1913adb
--- /dev/null
+++ b/www/p5-MasonX-Apache2Handler/pkg-plist
@@ -0,0 +1,8 @@
+%%SITE_PERL%%/MasonX/Mason-with-mod_perl2.pod
+%%SITE_PERL%%/MasonX/Request2.pm
+%%SITE_PERL%%/MasonX/Apache2Handler.pm
+%%SITE_PERL%%/MasonX/Buffer2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX/Apache2Handler/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX/Apache2Handler
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX 2>/dev/null || true
+@dirrm %%SITE_PERL%%/MasonX