diff --git a/lang/p5-Marpa-XS/Makefile b/lang/p5-Marpa-XS/Makefile
index a1d58f69e90a..93420f2b908d 100644
--- a/lang/p5-Marpa-XS/Makefile
+++ b/lang/p5-Marpa-XS/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	Marpa-XS
-PORTVERSION=	0.022
+PORTVERSION=	0.024
 CATEGORIES=	lang textproc perl5
 MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:JKEGL
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION}000
 
@@ -29,7 +30,20 @@ TEST_DEPENDS=	p5-Test-Weaken>=3.004000:${PORTSDIR}/devel/p5-Test-Weaken
 
 PERL_CONFIGURE=	5.10.0+
 
-MAN3=		Marpa::XS.3
+MAN3=		Marpa::XS.3 \
+		Marpa::XS::Advanced::Bibliography.3 \
+		Marpa::XS::Advanced::Models.3 \
+		Marpa::XS::Debug.3 \
+		Marpa::XS::Grammar.3 \
+		Marpa::XS::Recognizer.3 \
+		Marpa::XS::Rewrite.3 \
+		Marpa::XS::Semantics.3 \
+		Marpa::XS::Semantics::Infinite.3 \
+		Marpa::XS::Semantics::Null.3 \
+		Marpa::XS::Semantics::Order.3 \
+		Marpa::XS::Support.3 \
+		Marpa::XS::Tracing.3 \
+		Marpa::XS::Vocabulary.3
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/p5-Marpa-XS/distinfo b/lang/p5-Marpa-XS/distinfo
index c016a83e37c1..7b5843b955d2 100644
--- a/lang/p5-Marpa-XS/distinfo
+++ b/lang/p5-Marpa-XS/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Marpa-XS-0.022000.tar.gz) = 9be59854b59b82185158eaa367ff9c04eaeec7c162c3e66fe9bba85fa7f781cd
-SIZE (Marpa-XS-0.022000.tar.gz) = 1339299
+SHA256 (Marpa-XS-0.024000.tar.gz) = aff1d5210bca86556a964c5789bfe2743035d43126a9b756523f4a866a384b50
+SIZE (Marpa-XS-0.024000.tar.gz) = 1339870
diff --git a/lang/p5-Marpa-XS/pkg-plist b/lang/p5-Marpa-XS/pkg-plist
index 251d9c4e0b0e..457f3a7d654f 100644
--- a/lang/p5-Marpa-XS/pkg-plist
+++ b/lang/p5-Marpa-XS/pkg-plist
@@ -1,15 +1,30 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Advanced/Bibliography.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Advanced/Models.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Debug.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Grammar.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Grammar.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Installed.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Internal.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Recognizer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Recognizer.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Rewrite.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics/Infinite.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics/Null.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics/Order.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Support.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Tracing.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Value.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Version.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Vocabulary.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/XS/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/XS/XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/XS/XS.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Advanced
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Marpa