diff --git a/www/p5-Catalyst/Makefile b/www/p5-Catalyst/Makefile
index 980a781133ea..1dd51668b8ea 100644
--- a/www/p5-Catalyst/Makefile
+++ b/www/p5-Catalyst/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	Catalyst
-PORTVERSION=	5.10
+PORTVERSION=	5.22
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
@@ -17,7 +17,6 @@ MAINTAINER=	lth@FreeBSD.org
 COMMENT=	The Elegant MVC Web Application Framework
 
 BUILD_DEPENDS=	${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-exports \
-		${SITE_PERL}/CGI/Simple.pm:${PORTSDIR}/www/p5-CGI-Simple \
 		${SITE_PERL}/Class/Accessor/Fast.pm:${PORTSDIR}/devel/p5-Class-Accessor \
 		${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
 		${SITE_PERL}/HTTP/Daemon.pm:${PORTSDIR}/www/p5-libwww \
@@ -28,8 +27,6 @@ BUILD_DEPENDS=	${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-
 		${SITE_PERL}/Tree/Simple.pm:${PORTSDIR}/devel/p5-Tree-Simple \
 		${SITE_PERL}/Tree/Simple/Visitor/FindByPath.pm:${PORTSDIR}/devel/p5-Tree-Simple-VisitorFactory \
 		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/NEXT.pm:${PORTSDIR}/devel/p5-NEXT \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${SITE_PERL}/Path/Class.pm:${PORTSDIR}/devel/p5-Path-Class
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
@@ -42,12 +39,27 @@ MAN3=	Catalyst.3 \
 	Catalyst::Dispatcher.3 \
 	Catalyst::Engine.3 \
 	Catalyst::Engine::Apache.3 \
+	Catalyst::Engine::Apache::Base.3 \
 	Catalyst::Engine::Apache::MP13.3 \
+	Catalyst::Engine::Apache::MP13::Apreq.3 \
+	Catalyst::Engine::Apache::MP13::Base.3 \
 	Catalyst::Engine::Apache::MP19.3 \
+	Catalyst::Engine::Apache::MP19::Apreq.3 \
+	Catalyst::Engine::Apache::MP19::Base.3 \
 	Catalyst::Engine::Apache::MP20.3 \
+	Catalyst::Engine::Apache::MP20::Apreq.3 \
+	Catalyst::Engine::Apache::MP20::Base.3 \
 	Catalyst::Engine::CGI.3 \
-	Catalyst::Engine::FCGI.3 \
+	Catalyst::Engine::CGI::APR.3 \
+	Catalyst::Engine::CGI::Base.3 \
+	Catalyst::Engine::FastCGI.3 \
+	Catalyst::Engine::FastCGI::APR.3 \
+	Catalyst::Engine::FastCGI::Base.3 \
 	Catalyst::Engine::HTTP.3 \
+	Catalyst::Engine::HTTP::Base.3 \
+	Catalyst::Engine::HTTP::Daemon.3 \
+	Catalyst::Engine::SpeedyCGI.3 \
+	Catalyst::Engine::SpeedyCGI::Base.3 \
 	Catalyst::Engine::Test.3 \
 	Catalyst::Helper.3 \
 	Catalyst::Log.3 \
@@ -67,7 +79,7 @@ MAN3=	Catalyst.3 \
 	Catalyst::Utils.3
 
 .include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} <= 500503
-IGNORE=	requires Perl 5.6. Install lang/perl5 or lang/perl5.8, and try again
+.if ${PERL_LEVEL} < 500801
+IGNORE=	requires at least Perl 5.8.1. Install lang/perl5.8, and try again
 .endif
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst/distinfo b/www/p5-Catalyst/distinfo
index 5649fe9c7c3f..67641d8d9dec 100644
--- a/www/p5-Catalyst/distinfo
+++ b/www/p5-Catalyst/distinfo
@@ -1,2 +1,2 @@
-MD5 (Catalyst-5.10.tar.gz) = c06591b62427f768a74bcf45d19e1fef
-SIZE (Catalyst-5.10.tar.gz) = 53861
+MD5 (Catalyst-5.22.tar.gz) = 49a487ab1a4711980c50d98f0a0603c3
+SIZE (Catalyst-5.22.tar.gz) = 60339
diff --git a/www/p5-Catalyst/pkg-plist b/www/p5-Catalyst/pkg-plist
index 24f448c48cf5..69bf29a6b1ce 100644
--- a/www/p5-Catalyst/pkg-plist
+++ b/www/p5-Catalyst/pkg-plist
@@ -5,12 +5,27 @@ bin/catalyst.pl
 %%SITE_PERL%%/Catalyst/Dispatcher.pm
 %%SITE_PERL%%/Catalyst/Engine.pm
 %%SITE_PERL%%/Catalyst/Engine/Apache.pm
+%%SITE_PERL%%/Catalyst/Engine/Apache/Base.pm
 %%SITE_PERL%%/Catalyst/Engine/Apache/MP13.pm
+%%SITE_PERL%%/Catalyst/Engine/Apache/MP13/Apreq.pm
+%%SITE_PERL%%/Catalyst/Engine/Apache/MP13/Base.pm
 %%SITE_PERL%%/Catalyst/Engine/Apache/MP19.pm
+%%SITE_PERL%%/Catalyst/Engine/Apache/MP19/Apreq.pm
+%%SITE_PERL%%/Catalyst/Engine/Apache/MP19/Base.pm
 %%SITE_PERL%%/Catalyst/Engine/Apache/MP20.pm
+%%SITE_PERL%%/Catalyst/Engine/Apache/MP20/Apreq.pm
+%%SITE_PERL%%/Catalyst/Engine/Apache/MP20/Base.pm
 %%SITE_PERL%%/Catalyst/Engine/CGI.pm
-%%SITE_PERL%%/Catalyst/Engine/FCGI.pm
+%%SITE_PERL%%/Catalyst/Engine/CGI/APR.pm
+%%SITE_PERL%%/Catalyst/Engine/CGI/Base.pm
+%%SITE_PERL%%/Catalyst/Engine/FastCGI.pm
+%%SITE_PERL%%/Catalyst/Engine/FastCGI/APR.pm
+%%SITE_PERL%%/Catalyst/Engine/FastCGI/Base.pm
 %%SITE_PERL%%/Catalyst/Engine/HTTP.pm
+%%SITE_PERL%%/Catalyst/Engine/HTTP/Base.pm
+%%SITE_PERL%%/Catalyst/Engine/HTTP/Daemon.pm
+%%SITE_PERL%%/Catalyst/Engine/SpeedyCGI.pm
+%%SITE_PERL%%/Catalyst/Engine/SpeedyCGI/Base.pm
 %%SITE_PERL%%/Catalyst/Engine/Test.pm
 %%SITE_PERL%%/Catalyst/Helper.pm
 %%SITE_PERL%%/Catalyst/Log.pm
@@ -28,7 +43,14 @@ bin/catalyst.pl
 %%SITE_PERL%%/Catalyst/Response.pm
 %%SITE_PERL%%/Catalyst/Test.pm
 %%SITE_PERL%%/Catalyst/Utils.pm
+@dirrm %%SITE_PERL%%/Catalyst/Engine/Apache/MP13
+@dirrm %%SITE_PERL%%/Catalyst/Engine/Apache/MP19
+@dirrm %%SITE_PERL%%/Catalyst/Engine/Apache/MP20
 @dirrm %%SITE_PERL%%/Catalyst/Engine/Apache
+@dirrm %%SITE_PERL%%/Catalyst/Engine/CGI
+@dirrm %%SITE_PERL%%/Catalyst/Engine/FastCGI
+@dirrm %%SITE_PERL%%/Catalyst/Engine/HTTP
+@dirrm %%SITE_PERL%%/Catalyst/Engine/SpeedyCGI
 @dirrm %%SITE_PERL%%/Catalyst/Engine
 @dirrm %%SITE_PERL%%/Catalyst/Manual
 @dirrm %%SITE_PERL%%/Catalyst/Request