diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index 6c8fdac3f6a8..ea1e6df39d22 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -1,8 +1,10 @@
 PORTNAME=	zookeeper
-PORTVERSION=	3.6.2
+PORTVERSION=	3.7.0
 CATEGORIES=	devel java
-MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+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
@@ -11,39 +13,46 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	libzookeeper>=${PORTVERSION}:devel/libzookeeper
 
-ZOOKEEPER_CONFS?=	configuration.xsl log4j.properties zoo.cfg
-ZOOKEEPER_USER?=	zookeeper
-ZOOKEEPER_GROUP?=	zookeeper
-ZOOKEEPER_DBDIR?=	/var/db/zookeeper
-ZOOKEEPER_LOGDIR?=	/var/log/zookeeper
+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
 
-USERS=	${ZOOKEEPER_USER}
-GROUPS=	${ZOOKEEPER_GROUP}
+USE_JAVA=	yes
+JAVA_VERSION=	8+
+JAVA_RUN=	yes
+USE_RC_SUBR=	zookeeper
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-
-USE_RC_SUBR=	zookeeper
-SUB_FILES=	zookeeper zkCli.sh
+NO_ARCH=	yes
+NO_BUILD=	yes
+SUB_FILES=	zkCli.sh
 SUB_LIST=	JAVA=${JAVA} \
-		ZOOKEEPER_USER=${ZOOKEEPER_USER} \
-		ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
-		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
-		ZOOKEEPER_USER=${ZOOKEEPER_USER} \
 		ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP} \
-		ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
-		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
+		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
+		ZOOKEEPER_USER=${ZOOKEEPER_USER}
 
-NO_BUILD=	yes
-NO_ARCH=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	8+
-JAVA_RUN=	yes
+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
+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
@@ -56,9 +65,7 @@ do-install:
 .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}
 
@@ -67,4 +74,14 @@ do-install-DOCS-on:
 	@(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 e3f55421f000..0c89279b5d5e 100644
--- a/devel/zookeeper/distinfo
+++ b/devel/zookeeper/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1601309538
-SHA256 (apache-zookeeper-3.6.2-bin.tar.gz) = 476f6fce10f9528e3a4ad00e6cd1714563f602dd4924db78e506c0df28fea1e5
-SIZE (apache-zookeeper-3.6.2-bin.tar.gz) = 12515974
+TIMESTAMP = 1617193083
+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
diff --git a/devel/zookeeper/files/log4j2.properties b/devel/zookeeper/files/log4j2.properties
new file mode 100644
index 000000000000..ce37bd760065
--- /dev/null
+++ b/devel/zookeeper/files/log4j2.properties
@@ -0,0 +1,102 @@
+# Copyright 2015 The Apache Software Foundation
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Define some default values that can be overridden by system properties
+property.zookeeper.console.threshold = TRACE
+
+property.zookeeper.log.dir = .
+property.zookeeper.log.file = zookeeper.log
+property.zookeeper.log.threshold = INFO
+property.zookeeper.log.maxfilesize = 256MB
+property.zookeeper.log.maxbackupindex = 20
+
+property.zookeeper.tracelog.dir = ${sys:zookeeper.log.dir}
+property.zookeeper.tracelog.file = zookeeper_trace.log
+
+status = ERROR
+name = PropertiesConfig
+
+rootLogger.level = INFO
+#rootLogger.appenderRef.CONSOLE.ref = CONSOLE
+rootLogger.appenderRef.ROLLINGFILE.ref = ROLLINGFILE
+
+appenders = ROLLINGFILE
+
+#
+# Add CONSOLE to rootlogger above if you want to use this 
+#
+appender.CONSOLE.type = Console
+appender.CONSOLE.name = CONSOLE
+appender.CONSOLE.filter.threshold.type = ThresholdFilter
+appender.CONSOLE.filter.threshold.level = ${sys:zookeeper.console.threshold}
+appender.CONSOLE.layout.type = PatternLayout
+appender.CONSOLE.layout.pattern = %d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
+
+#
+# Add ROLLINGFILE to rootLogger to get log file output
+#
+appender.ROLLINGFILE.type = RollingFile
+appender.ROLLINGFILE.name = ROLLINGFILE
+appender.ROLLINGFILE.filter.threshold.type = ThresholdFilter
+appender.ROLLINGFILE.filter.threshold.level = ${sys:zookeeper.log.threshold}
+appender.ROLLINGFILE.layout.type = PatternLayout
+appender.ROLLINGFILE.layout.pattern = %d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
+appender.ROLLINGFILE.fileName = ${sys:zookeeper.log.dir}/${sys:zookeeper.log.file}
+appender.ROLLINGFILE.filePattern = ${sys:zookeeper.log.dir}/${sys:zookeeper.log.file}.%i
+appender.ROLLINGFILE.policies.type = Policies
+appender.ROLLINGFILE.policies.size.type = SizeBasedTriggeringPolicy
+appender.ROLLINGFILE.policies.size.size = ${sys:zookeeper.log.maxfilesize}
+appender.ROLLINGFILE.strategy.type = DefaultRolloverStrategy
+appender.ROLLINGFILE.strategy.max = ${sys:zookeeper.log.maxbackupindex}
+#
+# Add TRACEFILE to rootLogger to get log file output
+#    Log TRACE level and above messages to a log file
+#
+appender.TRACEFILE.type = File
+appender.TRACEFILE.name = TRACEFILE
+appender.TRACEFILE.filter.threshold.type = ThresholdFilter
+appender.TRACEFILE.filter.threshold.level = TRACE
+appender.TRACEFILE.fileName = ${sys:zookeeper.tracelog.dir}/${sys:zookeeper.tracelog.file}
+appender.TRACEFILE.layout.type = PatternLayout
+### Notice we are including log4j's NDC here (%x)
+appender.TRACEFILE.layout.pattern = %d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L][%x] - %m%n
+
+#
+# zk audit logging
+#
+property.zookeeper.auditlog.file = zookeeper_audit.log
+property.zookeeper.auditlog.threshold = INFO
+
+logger.audit.name = org.apache.zookeeper.audit.Log4jAuditLogger
+logger.audit.level = INFO
+logger.audit.appenderRef.RFAAUDIT.ref = RFAAUDIT
+logger.audit.additivity = false
+
+appender.RFAAUDIT.type = RollingFile
+appender.RFAAUDIT.name = RFAAUDIT
+appender.RFAAUDIT.filter.threshold.type = ThresholdFilter
+appender.RFAAUDIT.filter.threshold.level = ${sys:zookeeper.auditlog.threshold}
+appender.RFAAUDIT.layout.type = PatternLayout
+appender.RFAAUDIT.layout.pattern = %d{ISO8601} %p %c{2}: %m%n
+appender.RFAAUDIT.fileName = ${sys:zookeeper.log.dir}/${sys:zookeeper.auditlog.file}
+appender.RFAAUDIT.filePattern = ${sys:zookeeper.log.dir}/${sys:zookeeper.auditlog.file}.%i
+appender.RFAAUDIT.policies.type = Policies
+appender.RFAAUDIT.policies.size.type = SizeBasedTriggeringPolicy
+appender.RFAAUDIT.policies.size.size = 10MB
+appender.RFAAUDIT.strategy.type = DefaultRolloverStrategy
+appender.RFAAUDIT.strategy.max = 10
diff --git a/devel/zookeeper/files/zookeeper.in b/devel/zookeeper/files/zookeeper.in
index 6475558955b7..bb010bd1ae07 100644
--- a/devel/zookeeper/files/zookeeper.in
+++ b/devel/zookeeper/files/zookeeper.in
@@ -19,8 +19,9 @@ load_rc_config "${name}"
 : ${zookeeper_user:="%%ZOOKEEPER_USER%%"}
 : ${zookeeper_group:="%%ZOOKEEPER_GROUP%%"}
 : ${zookeeper_config:="%%ETCDIR%%/zoo.cfg"}
-: ${zookeeper_log4j_config:="%%ETCDIR%%/log4j.properties"}
-: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
+%%NO_LOG4J2%%: ${zookeeper_log4j_config:="%%ETCDIR%%/log4j.properties"}
+%%NO_LOG4J2%%: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
+%%LOG4J2%%: ${zookeeper_log4j_config:="%%ETCDIR%%/log4j2.properties"}
 : ${zookeeper_logdir:="%%ZOOKEEPER_LOGDIR%%"}
 : ${zookeeper_syslog_output_enable:="YES"}
 
@@ -52,7 +53,8 @@ JAVA="%%JAVA%%"
 
 CLASSPATH=":%%DATADIR%%/*"
 
-log4j_params="-Dzookeeper.root.logger=${zookeeper_rootlogger} -Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j.configuration=file:${zookeeper_log4j_config}"
+%%NO_LOG4J2%%log4j_params="-Dzookeeper.root.logger=${zookeeper_rootlogger} -Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j.configuration=file:${zookeeper_log4j_config}"
+%%LOG4J2%%log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} -Dlog4j2.configurationFile=file:${zookeeper_log4j_config}"
 zookeeper_main="${zookeeper_java_opts} ${log4j_params} -cp ${CLASSPATH} org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"
 pidfile="/var/run/${name}.pid"
 required_dirs="${zookeeper_logdir}"
diff --git a/devel/zookeeper/pkg-plist b/devel/zookeeper/pkg-plist
index e2744a813901..7c06c0c71523 100644
--- a/devel/zookeeper/pkg-plist
+++ b/devel/zookeeper/pkg-plist
@@ -1,40 +1,43 @@
 bin/zkCli.sh
-%%DATADIR%%/audience-annotations-0.5.0.jar
-%%DATADIR%%/commons-cli-1.2.jar
-%%DATADIR%%/commons-lang-2.6.jar
-%%DATADIR%%/jackson-annotations-2.10.3.jar
-%%DATADIR%%/jackson-core-2.10.3.jar
-%%DATADIR%%/jackson-databind-2.10.3.jar
+%%DATADIR%%/audience-annotations-0.12.0.jar
+%%DATADIR%%/commons-cli-1.4.jar
+%%DATADIR%%/jackson-annotations-2.10.5.jar
+%%DATADIR%%/jackson-core-2.10.5.jar
+%%DATADIR%%/jackson-databind-2.10.5.1.jar
 %%DATADIR%%/javax.servlet-api-3.1.0.jar
-%%DATADIR%%/jetty-http-9.4.24.v20191120.jar
-%%DATADIR%%/jetty-io-9.4.24.v20191120.jar
-%%DATADIR%%/jetty-security-9.4.24.v20191120.jar
-%%DATADIR%%/jetty-server-9.4.24.v20191120.jar
-%%DATADIR%%/jetty-servlet-9.4.24.v20191120.jar
-%%DATADIR%%/jetty-util-9.4.24.v20191120.jar
+%%DATADIR%%/jetty-http-9.4.38.v20210224.jar
+%%DATADIR%%/jetty-io-9.4.38.v20210224.jar
+%%DATADIR%%/jetty-security-9.4.38.v20210224.jar
+%%DATADIR%%/jetty-server-9.4.38.v20210224.jar
+%%DATADIR%%/jetty-servlet-9.4.38.v20210224.jar
+%%DATADIR%%/jetty-util-9.4.38.v20210224.jar
+%%DATADIR%%/jetty-util-ajax-9.4.38.v20210224.jar
 %%DATADIR%%/jline-2.14.6.jar
-%%DATADIR%%/json-simple-1.1.1.jar
-%%DATADIR%%/log4j-1.2.17.jar
-%%DATADIR%%/metrics-core-3.2.5.jar
-%%DATADIR%%/netty-buffer-4.1.50.Final.jar
-%%DATADIR%%/netty-codec-4.1.50.Final.jar
-%%DATADIR%%/netty-common-4.1.50.Final.jar
-%%DATADIR%%/netty-handler-4.1.50.Final.jar
-%%DATADIR%%/netty-resolver-4.1.50.Final.jar
-%%DATADIR%%/netty-transport-4.1.50.Final.jar
-%%DATADIR%%/netty-transport-native-epoll-4.1.50.Final.jar
-%%DATADIR%%/netty-transport-native-unix-common-4.1.50.Final.jar
-%%DATADIR%%/simpleclient_common-0.6.0.jar
-%%DATADIR%%/simpleclient_hotspot-0.6.0.jar
-%%DATADIR%%/simpleclient_servlet-0.6.0.jar
-%%DATADIR%%/simpleclient-0.6.0.jar
-%%DATADIR%%/slf4j-api-1.7.25.jar
-%%DATADIR%%/slf4j-log4j12-1.7.25.jar
-%%DATADIR%%/snappy-java-1.1.7.jar
+%%DATADIR%%/metrics-core-4.1.12.1.jar
+%%DATADIR%%/netty-buffer-4.1.59.Final.jar
+%%DATADIR%%/netty-codec-4.1.59.Final.jar
+%%DATADIR%%/netty-common-4.1.59.Final.jar
+%%DATADIR%%/netty-handler-4.1.59.Final.jar
+%%DATADIR%%/netty-resolver-4.1.59.Final.jar
+%%DATADIR%%/netty-transport-4.1.59.Final.jar
+%%DATADIR%%/netty-transport-native-epoll-4.1.59.Final.jar
+%%DATADIR%%/netty-transport-native-unix-common-4.1.59.Final.jar
+%%DATADIR%%/simpleclient-0.9.0.jar
+%%DATADIR%%/simpleclient_common-0.9.0.jar
+%%DATADIR%%/simpleclient_hotspot-0.9.0.jar
+%%DATADIR%%/simpleclient_servlet-0.9.0.jar
+%%DATADIR%%/slf4j-api-1.7.30.jar
+%%DATADIR%%/snappy-java-1.1.7.7.jar
 %%DATADIR%%/zookeeper-%%PORTVERSION%%.jar
 %%DATADIR%%/zookeeper-jute-%%PORTVERSION%%.jar
 %%DATADIR%%/zookeeper-prometheus-metrics-%%PORTVERSION%%.jar
-@sample %%ETCDIR%%/log4j.properties.sample
+%%LOG4J2%%%%DATADIR%%/log4j-api-%%ZOOKEEPER_LOG4J2_VERSION%%.jar
+%%LOG4J2%%%%DATADIR%%/log4j-core-%%ZOOKEEPER_LOG4J2_VERSION%%.jar
+%%LOG4J2%%%%DATADIR%%/log4j-slf4j-impl-%%ZOOKEEPER_LOG4J2_VERSION%%.jar
+%%LOG4J2%%@sample %%ETCDIR%%/log4j2.properties.sample
+%%NO_LOG4J2%%%%DATADIR%%/log4j-1.2.17.jar
+%%NO_LOG4J2%%%%DATADIR%%/slf4j-log4j12-1.7.30.jar
+%%NO_LOG4J2%%@sample %%ETCDIR%%/log4j.properties.sample
 @sample %%ETCDIR%%/configuration.xsl.sample
 @sample %%ETCDIR%%/zoo.cfg.sample
 @dir(%%ZOOKEEPER_USER%%,%%ZOOKEEPER_GROUP%%,755) %%ETCDIR%%