diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index a42ef217d386..be69f492296e 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	libapreq2
-PORTVERSION=	2.16
+PORTVERSION=	2.17
 CATEGORIES=	www perl5 devel
 MASTER_SITES=	APACHE_HTTPD/libapreq
 DISTFILE=	libapreq2-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Perl binding for the Generic Apache2 Request Library
 WWW=		https://metacpan.org/dist/libapreq2
 
 LICENSE=	APACHE20
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apache2-apxs=${APXS} \
 		--with-expat=${LOCALBASE} \
 		--enable-perl-glue --with-perl=${PERL}
 USES=		apache cpe libtool perl5
 CPE_VENDOR=	apache
 USE_PERL5=	run
 USE_LDCONFIG=	yes
 
 BUILD_DEPENDS=	libapreq2>0:www/libapreq2 \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
 		p5-ExtUtils-XSBuilder>=0:devel/p5-ExtUtils-XSBuilder \
 		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 
 RUN_DEPENDS=	libapreq2>0:www/libapreq2 \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
 		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \
 		${WRKSRC}/glue/perl/Makefile.PL
 post-install:
 	# remove all the non-perl stuff
 	${RM} ${STAGEDIR}${PREFIX}/bin/apreq2-config
 	${RM} -r ${STAGEDIR}${PREFIX}/include/apreq2
 	${RM} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/apreq2/apreq_module_apache2.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/libapreq2*
 	${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_apreq2*
 	${RMDIR} -p ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/apreq2 \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR} 2>/dev/null || :
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/APR/Request/Request.so
 .for i in Apache2 CGI Cookie Error Hook Param Parser
 	${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/APR/Request/${i}/${i}.so
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/p5-libapreq2/distinfo b/www/p5-libapreq2/distinfo
index cf3b7af57d95..91c9231e7a9c 100644
--- a/www/p5-libapreq2/distinfo
+++ b/www/p5-libapreq2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616240707
-SHA256 (libapreq2-2.16.tar.gz) = e04c855a3ea070b8863569fbae02fe828f534ac88755b23e24d3863cc9598349
-SIZE (libapreq2-2.16.tar.gz) = 839264
+TIMESTAMP = 1735469578
+SHA256 (libapreq2-2.17.tar.gz) = 046487f084c12fa1c822affc5f7de56efed9b48905a426e631a6b949c114d86c
+SIZE (libapreq2-2.17.tar.gz) = 849867
diff --git a/www/p5-libapreq2/files/patch-glue_perl_xsbuilder_apreq__xs__tables.h b/www/p5-libapreq2/files/patch-glue_perl_xsbuilder_apreq__xs__tables.h
new file mode 100644
index 000000000000..a45af6346f13
--- /dev/null
+++ b/www/p5-libapreq2/files/patch-glue_perl_xsbuilder_apreq__xs__tables.h
@@ -0,0 +1,20 @@
+--- glue/perl/xsbuilder/apreq_xs_tables.h.orig	2022-08-18 09:18:20 UTC
++++ glue/perl/xsbuilder/apreq_xs_tables.h
+@@ -42,7 +42,7 @@ static int apreq_xs_cookie_table_magic_copy(pTHX_ SV *
+  */
+ 
+ static int apreq_xs_cookie_table_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv,
+-                                            const char *name, int namelen)
++                                            const char *name, I32 namelen)
+ {
+     /* Prefetch the value whenever the table iterator is > 0 */
+     MAGIC *tie_magic = mg_find(nsv, PERL_MAGIC_tiedelem);
+@@ -151,7 +151,7 @@ static int apreq_xs_param_table_magic_copy(pTHX_ SV *s
+  */
+ 
+ static int apreq_xs_param_table_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv,
+-                                  const char *name, int namelen)
++                                  const char *name, I32 namelen)
+ {
+     /* Prefetch the value whenever the table iterator is > 0 */
+     MAGIC *tie_magic = mg_find(nsv, PERL_MAGIC_tiedelem);