diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index e3c536f5b2ac..370343da792b 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -1,26 +1,30 @@
 # New ports collection makefile for:    p5-Apache-SSI
 # Date created:				May 27 2001
 # Whom:	      				vanilla
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Apache-SSI
-PORTVERSION=	2.17
+PORTVERSION=	2.19
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Apache::SSI - Implement Server Side Includes in Perl
+MAINTAINER=	perl@FreeBSD.org
+COMMENT=	Implement Server Side Includes in Perl
 
-BUILD_DEPENDS=	${SITE_PERL}/HTML/SimpleParse.pm:${PORTSDIR}/www/p5-HTML-SimpleParse
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${SITE_PERL}/HTML/SimpleParse.pm:${PORTSDIR}/www/p5-HTML-SimpleParse \
+		${SITE_PERL}/${PERL_ARCH}/Apache/Constants.pm:${PORTSDIR}/www/mod_perl
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+PERL_MODBUILD=	yes
 
 MAN3=		Apache::SSI.3 \
 		Apache::FakeSSI.3
 
+post-patch:
+	${REINPLACE_CMD} -e '/STDIN/d' ${WRKSRC}/t/lib/Apache/test.pm
+
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-SSI/distinfo b/www/p5-Apache-SSI/distinfo
index 8ec86be8d8b6..5e3b5572669e 100644
--- a/www/p5-Apache-SSI/distinfo
+++ b/www/p5-Apache-SSI/distinfo
@@ -1,3 +1,3 @@
-MD5 (Apache-SSI-2.17.tar.gz) = b229a3a25a82935cad2da1af637714be
-SHA256 (Apache-SSI-2.17.tar.gz) = 4217b538b364474a012ee96679158f604c231e8aaaa956e63006f5ebefddce23
-SIZE (Apache-SSI-2.17.tar.gz) = 25819
+MD5 (Apache-SSI-2.19.tar.gz) = 8ff9ab76a1000c49b221821511af9953
+SHA256 (Apache-SSI-2.19.tar.gz) = d406af4beefbdccfb496d6a4413b4227d085a05b966f2d150c1bc896f6c34bc8
+SIZE (Apache-SSI-2.19.tar.gz) = 26881
diff --git a/www/p5-Apache-SSI/files/patch-Makefile.PL b/www/p5-Apache-SSI/files/patch-Makefile.PL
deleted file mode 100644
index d187dfeb34f8..000000000000
--- a/www/p5-Apache-SSI/files/patch-Makefile.PL
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.PL.orig	Sat May 26 17:38:41 2001
-+++ Makefile.PL	Sat May 26 17:39:28 2001
-@@ -1,13 +1,13 @@
- use ExtUtils::MakeMaker;
--use lib 't/lib';
--use Apache::test;
-+#use lib 't/lib';
-+#use Apache::test;
- 
--my %params = Apache::test->get_test_params();
--chomp (my $cwd = `pwd`);
--Apache::test->write_httpd_conf
--    (%params, 
--     include => join '', <DATA>);
--*MY::test = sub { Apache::test->MM_test(%params) };
-+#my %params = Apache::test->get_test_params();
-+#chomp (my $cwd = `pwd`);
-+#Apache::test->write_httpd_conf
-+#    (%params, 
-+#     include => join '', <DATA>);
-+#*MY::test = sub { Apache::test->MM_test(%params) };
- 
- 
- my $module = 'Apache::SSI';
diff --git a/www/p5-Apache-SSI/pkg-plist b/www/p5-Apache-SSI/pkg-plist
index 1e7f8f750b71..7ce8aa82185d 100644
--- a/www/p5-Apache-SSI/pkg-plist
+++ b/www/p5-Apache-SSI/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/Apache/SSI.pm
 %%SITE_PERL%%/Apache/FakeSSI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SSI/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SSI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 @dirrmtry %%SITE_PERL%%/Apache