diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile
index b0302a218d73..30c9f3d0d221 100644
--- a/www/p5-CGI-SpeedyCGI/Makefile
+++ b/www/p5-CGI-SpeedyCGI/Makefile
@@ -1,56 +1,62 @@
 PORTNAME=	CGI-SpeedyCGI
 PORTVERSION=	2.22
 PORTREVISION=	9
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Speed up perl CGI scripts by running them persistently
 WWW=		http://daemoninc.com/SpeedyCGI/
 
 LICENSE=	GPLv2
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
 USE_PERL5=	configure patch
 
 OPTIONS_DEFINE=	APACHE
 OPTIONS_DEFAULT=APACHE
 APACHE_DESC=	Build mod_speedycgi
 
 OPTIONS_SUB=	yes
 APACHE_USES=	apache
 APACHE_CONFIGURE_ENV_OFF=	WITHOUT_APACHE=yes
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/__inline__//g' \
 		${WRKSRC}/src/speedy_inc.h
 	@${PERL} -pi -e 's,apxs -q,${APXS} -q,;' \
 		${WRKSRC}/src/SpeedyMake.pl
 	@${PERL} -pi -e 's,APXS=apxs,APXS=${APXS},;' \
 		${WRKSRC}/mod_speedycgi/Makefile.tmpl
 	${CP} ${FILESDIR}/speedy_dump.c ${WRKSRC}/speedy_dump/
 	@${REINPLACE_CMD} -i '' -e 's=New(123,=Newx(=g' \
 		${WRKSRC}/src/speedy_backend_main.h
 	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \
 		${WRKSRC}/mod_speedycgi/Makefile.tmpl
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
 post-configure:
 	@${PERL} -pi -e 's,^PREFIX = /usr$$,PREFIX = ${PREFIX},g;' \
 		${WRKSRC}/Makefile ${WRKSRC}/*/Makefile
 
 post-build:
 	@(cd ${WRKSRC}/speedy_dump && ${CC} ${CFLAGS} -o speedy_dump \
 		-I../src speedy_dump.c)
 
 post-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/speedy/speedy ${STAGEDIR}${PREFIX}/bin/speedy_suidperl
 	@${CHMOD} 4755 ${STAGEDIR}${PREFIX}/bin/speedy_suidperl
 	@${INSTALL_PROGRAM} ${WRKSRC}/speedy_dump/speedy_dump \
 		${STAGEDIR}${PREFIX}/bin/speedy_dump
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-SpeedyCGI/pkg-plist b/www/p5-CGI-SpeedyCGI/pkg-plist
index 78972b3fea5b..319060ba8904 100644
--- a/www/p5-CGI-SpeedyCGI/pkg-plist
+++ b/www/p5-CGI-SpeedyCGI/pkg-plist
@@ -1,8 +1,8 @@
 bin/speedy
 bin/speedy_backend
 bin/speedy_dump
 bin/speedy_suidperl
 %%SITE_PERL%%/CGI/SpeedyCGI.pm
 %%APACHE%%%%APACHEMODDIR%%/mod_speedycgi.so
-%%APACHE%%@exec %D/sbin/apxs -e -a -n speedycgi %D/%F
-%%APACHE%%@unexec %D/sbin/apxs -e -A -n speedycgi %D/%F
+%%APACHE%%@postexec %D/sbin/apxs -e -a -n speedycgi %D/%F
+%%APACHE%%@postunexec %D/sbin/apxs -e -A -n speedycgi %D/%F