diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index be777e599719..2e9b13a8c03f 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -1,89 +1,90 @@
 PORTNAME=	zookeeper
 PORTVERSION=	3.7.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		APACHE/logging/log4j/${ZOOKEEPER_LOG4J2_VERSION}/:log4j2
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	Coordination Service for Distributed Applications
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	libzookeeper>=${PORTVERSION}:devel/libzookeeper
 
 ZOOKEEPER_CONFS=		configuration.xsl zoo.cfg
 ZOOKEEPER_USER?=		zookeeper
 ZOOKEEPER_GROUP?=		zookeeper
 ZOOKEEPER_DBDIR?=		/var/db/zookeeper
 ZOOKEEPER_LOGDIR?=		/var/log/zookeeper
-ZOOKEEPER_LOG4J2_VERSION?=	2.14.1
+ZOOKEEPER_LOG4J2_VERSION?=	2.16.0
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	8+
 JAVA_RUN=	yes
 USE_RC_SUBR=	zookeeper
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	zkCli.sh
 SUB_LIST=	JAVA=${JAVA} \
 		ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
 		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
 		ZOOKEEPER_USER=${ZOOKEEPER_USER}
 
 USERS=		${ZOOKEEPER_USER}
 GROUPS=		${ZOOKEEPER_GROUP}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
 		ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
 		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
 		ZOOKEEPER_USER=${ZOOKEEPER_USER}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS LOG4J2
 OPTIONS_SUB=	yes
 
 LOG4J2_DESC=		Use log4j-2 instead log4j-1.2
 LOG4J2_DISTFILES=	apache-log4j-${ZOOKEEPER_LOG4J2_VERSION}-bin${EXTRACT_SUFX}:log4j2
 LOG4J2_PLIST_SUB=	ZOOKEEPER_LOG4J2_VERSION=${ZOOKEEPER_LOG4J2_VERSION}
 LOG4J2_JARS=		log4j-api-${ZOOKEEPER_LOG4J2_VERSION}.jar \
 			log4j-core-${ZOOKEEPER_LOG4J2_VERSION}.jar \
 			log4j-slf4j-impl-${ZOOKEEPER_LOG4J2_VERSION}.jar
 
 post-extract:
 	@${REINPLACE_CMD} "/dataDir/s|=.*|=${ZOOKEEPER_DBDIR}|" ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg
 	@${MV} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg ${WRKDIR}/${DISTNAME}/conf/zoo.cfg
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 .for f in ${ZOOKEEPER_CONFS}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "-name *\.jar")
 	${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR}
 	${MKDIR} ${STAGEDIR}${ZOOKEEPER_DBDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKDIR}/${DISTNAME}/docs && \
 	${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR})
 
 do-install-LOG4J2-on:
 	${RM} ${STAGEDIR}${DATADIR}/log4j-1.2* ${STAGEDIR}${DATADIR}/slf4j-log4j12*
 .for f in ${LOG4J2_JARS}
 	${INSTALL_DATA} ${WRKDIR}/apache-log4j-${ZOOKEEPER_LOG4J2_VERSION}-bin/${f} ${STAGEDIR}${DATADIR}/
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/log4j2.properties ${STAGEDIR}${ETCDIR}/log4j2.properties.sample
 
 do-install-LOG4J2-off:
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/log4j.properties ${STAGEDIR}${ETCDIR}/log4j.properties.sample
 
 .include <bsd.port.mk>
diff --git a/devel/zookeeper/distinfo b/devel/zookeeper/distinfo
index 0c89279b5d5e..ab2ac101202f 100644
--- a/devel/zookeeper/distinfo
+++ b/devel/zookeeper/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1617193083
+TIMESTAMP = 1639644220
 SHA256 (apache-zookeeper-3.7.0-bin.tar.gz) = 2f265d27b40fcba5ccf6c56c4c38fb224e24e4155a0bea65ee681a7e20f7c215
 SIZE (apache-zookeeper-3.7.0-bin.tar.gz) = 12387614
-SHA256 (apache-log4j-2.14.1-bin.tar.gz) = 97cb04e858f6b12f8133063584775a89bec9ac8c1657471cf6cd5ecf7c724bd6
-SIZE (apache-log4j-2.14.1-bin.tar.gz) = 14877605
+SHA256 (apache-log4j-2.16.0-bin.tar.gz) = d4a5135c761abdc50690d0d4f17759228761f7296361dd14df130913c215879c
+SIZE (apache-log4j-2.16.0-bin.tar.gz) = 14029653