diff --git a/www/mod_http2/Makefile b/www/mod_http2/Makefile
index efda1eb9e154..3d65a808a399 100644
--- a/www/mod_http2/Makefile
+++ b/www/mod_http2/Makefile
@@ -1,43 +1,49 @@
 PORTNAME=	mod_http2
-DISTVERSION=	2.0.15
+DISTVERSION=	2.0.18
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/icing/mod_h2/releases/download/v${DISTVERSION}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	HTTP/2 modules for Apache httpd
 WWW=		https://github.com/icing/mod_h2
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
 
 USES=		apache libtool ssl pkgconfig
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--without-curl
 
 MODULENAME=	mod_h2
 
 SUB_FILES=	200_mod_http2.conf 300_mod_proxy_http2.conf
 PORTDOCS=	README README.md
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+CFLAGS+=	-Wno-error=tautological-constant-out-of-range-compare
+.endif
+
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/200_mod_http2.conf \
 		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d/200_mod_h2.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/300_mod_proxy_http2.conf \
 		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d/300_mod_proxy_h2.conf.sample
 	# Rename mod_http2 to mod_h2 to avoid conflict with Apache24
 	${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_http2.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 	${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_http2.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so
 	${RM} ${STAGEDIR}${DOCSDIR}/LICENSE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mod_http2/distinfo b/www/mod_http2/distinfo
index 97161f31f2d7..5b6b6b5f405c 100644
--- a/www/mod_http2/distinfo
+++ b/www/mod_http2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684504186
-SHA256 (mod_http2-2.0.15.tar.gz) = b794cce745aef407712348b357b4cadb715284d862367a9539c1c866a7937218
-SIZE (mod_http2-2.0.15.tar.gz) = 1024179
+TIMESTAMP = 1686479145
+SHA256 (mod_http2-2.0.18.tar.gz) = 6cd9ee3e9dc2f1a1193cce19a16b9e3922d423d9b7b1eb2b8f8a2463d0a87a43
+SIZE (mod_http2-2.0.18.tar.gz) = 1025929