diff --git a/databases/pgpool-II-40/Makefile b/databases/pgpool-II-40/Makefile
index 1e8928e0c6bd..5cc3fa54ee99 100644
--- a/databases/pgpool-II-40/Makefile
+++ b/databases/pgpool-II-40/Makefile
@@ -1,50 +1,56 @@
 PORTNAME=	pgpool-II
-PORTVERSION=	4.0.21
+PORTVERSION=	4.0.22
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 PKGNAMESUFFIX=	40
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Connection pool server for PostgreSQL
 WWW=		https://pgpool.net/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake libtool pgsql:9.6+
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	pgpool
 
 GNU_CONFIGURE=	yes
 
 CONFLICTS_INSTALL=	pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/pcp.conf.sample
 
 PORTSCOUT=	limit:^4.0.[0-9]*
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS MEMCACHED PAM SSL
 OPTIONS_DEFAULT=	SSL
 
 MEMCACHED_DESC=	Use memcached for in memory query cache
 PAM_DESC=	Build with PAM support
 SSL_DESC=	Build with OpenSSL support
 
 MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
 PAM_CONFIGURE_ON=	--with-pam
 SSL_USES=		ssl
 SSL_CONFIGURE_WITH=	openssl
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/pgpool
 	${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.1.0.0 ${STAGEDIR}${PREFIX}/lib
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*"
 .for f in AUTHORS ChangeLog NEWS TODO
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/pgpool-II-40/distinfo b/databases/pgpool-II-40/distinfo
index 228f3921f8e0..b1c1d39ace00 100644
--- a/databases/pgpool-II-40/distinfo
+++ b/databases/pgpool-II-40/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672508896
-SHA256 (pgpool-II-4.0.21.tar.gz) = e3da965b7b4e46d8e4eb9e35535bbf3414d37bd86fc6be19d1de2c42eee1f7d9
-SIZE (pgpool-II-4.0.21.tar.gz) = 3959552
+TIMESTAMP = 1676902919
+SHA256 (pgpool-II-4.0.22.tar.gz) = 77fae336a9d925b08bd3301bad2e9bc2703e01aa46ddac4b2c7c6f38483f9512
+SIZE (pgpool-II-4.0.22.tar.gz) = 3967982