diff --git a/net/kafka/Makefile b/net/kafka/Makefile
index f1fc772a4268..231bb3ab2544 100644
--- a/net/kafka/Makefile
+++ b/net/kafka/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kafka
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.7.0
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}_2.13-${PORTVERSION}
@@ -36,7 +35,7 @@ KAFKA_BINS=	connect-distributed.sh connect-mirror-maker.sh \
 		kafka-console-consumer.sh kafka-console-producer.sh \
 		kafka-consumer-groups.sh kafka-consumer-perf-test.sh \
 		kafka-delegation-tokens.sh kafka-delete-records.sh \
-		kafka-dump-log.sh kafka-leader-election.sh \
+		kafka-dump-log.sh kafka-leader-election.sh kafka-features.sh \
 		kafka-log-dirs.sh kafka-mirror-maker.sh \
 		kafka-preferred-replica-election.sh kafka-producer-perf-test.sh \
 		kafka-reassign-partitions.sh kafka-replica-verification.sh \
diff --git a/net/kafka/distinfo b/net/kafka/distinfo
index 211a0722bd1e..bd9f7493a936 100644
--- a/net/kafka/distinfo
+++ b/net/kafka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597270671
-SHA256 (kafka_2.13-2.6.0.tgz) = 7c789adaa89654d935a5558d0dacff7466e2cfec9620cb8177cec141e7b0fb92
-SIZE (kafka_2.13-2.6.0.tgz) = 65537909
+TIMESTAMP = 1612587168
+SHA256 (kafka_2.13-2.7.0.tgz) = 1dd84b763676a02fecb48fa5d7e7e94a2bf2be9ff87bce14cf14109ce1cb7f90
+SIZE (kafka_2.13-2.7.0.tgz) = 68583422
diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist
index b40d4d68a019..3359a6af6dee 100644
--- a/net/kafka/pkg-plist
+++ b/net/kafka/pkg-plist
@@ -11,6 +11,7 @@
 %%DATADIR%%/bin/kafka-delegation-tokens.sh
 %%DATADIR%%/bin/kafka-delete-records.sh
 %%DATADIR%%/bin/kafka-dump-log.sh
+%%DATADIR%%/bin/kafka-features.sh
 %%DATADIR%%/bin/kafka-leader-election.sh
 %%DATADIR%%/bin/kafka-log-dirs.sh
 %%DATADIR%%/bin/kafka-mirror-maker.sh
@@ -28,7 +29,7 @@
 %%DATADIR%%/bin/trogdor.sh
 %%DATADIR%%/bin/zookeeper-security-migration.sh
 %%DATADIR%%/libs/activation-1.1.1.jar
-%%DATADIR%%/libs/aopalliance-repackaged-2.5.0.jar
+%%DATADIR%%/libs/aopalliance-repackaged-2.6.1.jar
 %%DATADIR%%/libs/argparse4j-0.7.0.jar
 %%DATADIR%%/libs/audience-annotations-0.5.0.jar
 %%DATADIR%%/libs/commons-cli-1.4.jar
@@ -41,48 +42,50 @@
 %%DATADIR%%/libs/connect-mirror-client-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-runtime-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-transforms-%%PORTVERSION%%.jar
-%%DATADIR%%/libs/hk2-api-2.5.0.jar
-%%DATADIR%%/libs/hk2-locator-2.5.0.jar
-%%DATADIR%%/libs/hk2-utils-2.5.0.jar
-%%DATADIR%%/libs/jackson-annotations-2.10.2.jar
-%%DATADIR%%/libs/jackson-core-2.10.2.jar
-%%DATADIR%%/libs/jackson-databind-2.10.2.jar
-%%DATADIR%%/libs/jackson-dataformat-csv-2.10.2.jar
-%%DATADIR%%/libs/jackson-datatype-jdk8-2.10.2.jar
-%%DATADIR%%/libs/jackson-jaxrs-base-2.10.2.jar
-%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.10.2.jar
-%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.10.2.jar
-%%DATADIR%%/libs/jackson-module-paranamer-2.10.2.jar
-%%DATADIR%%/libs/jackson-module-scala_2.13-2.10.2.jar
+%%DATADIR%%/libs/hk2-api-2.6.1.jar
+%%DATADIR%%/libs/hk2-locator-2.6.1.jar
+%%DATADIR%%/libs/hk2-utils-2.6.1.jar
+%%DATADIR%%/libs/jackson-annotations-2.10.5.jar
+%%DATADIR%%/libs/jackson-core-2.10.5.jar
+%%DATADIR%%/libs/jackson-databind-2.10.5.1.jar
+%%DATADIR%%/libs/jackson-dataformat-csv-2.10.5.jar
+%%DATADIR%%/libs/jackson-datatype-jdk8-2.10.5.jar
+%%DATADIR%%/libs/jackson-jaxrs-base-2.10.5.jar
+%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.10.5.jar
+%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.10.5.jar
+%%DATADIR%%/libs/jackson-module-paranamer-2.10.5.jar
+%%DATADIR%%/libs/jackson-module-scala_2.13-2.10.5.jar
 %%DATADIR%%/libs/jakarta.activation-api-1.2.1.jar
-%%DATADIR%%/libs/jakarta.annotation-api-1.3.4.jar
-%%DATADIR%%/libs/jakarta.inject-2.5.0.jar
-%%DATADIR%%/libs/jakarta.ws.rs-api-2.1.5.jar
+%%DATADIR%%/libs/jakarta.annotation-api-1.3.5.jar
+%%DATADIR%%/libs/jakarta.inject-2.6.1.jar
+%%DATADIR%%/libs/jakarta.validation-api-2.0.2.jar
+%%DATADIR%%/libs/jakarta.ws.rs-api-2.1.6.jar
 %%DATADIR%%/libs/jakarta.xml.bind-api-2.3.2.jar
-%%DATADIR%%/libs/javassist-3.22.0-CR2.jar
+%%DATADIR%%/libs/javassist-3.25.0-GA.jar
 %%DATADIR%%/libs/javassist-3.26.0-GA.jar
 %%DATADIR%%/libs/javax.servlet-api-3.1.0.jar
 %%DATADIR%%/libs/javax.ws.rs-api-2.1.1.jar
 %%DATADIR%%/libs/jaxb-api-2.3.0.jar
-%%DATADIR%%/libs/jersey-client-2.28.jar
-%%DATADIR%%/libs/jersey-common-2.28.jar
-%%DATADIR%%/libs/jersey-container-servlet-2.28.jar
-%%DATADIR%%/libs/jersey-container-servlet-core-2.28.jar
-%%DATADIR%%/libs/jersey-hk2-2.28.jar
-%%DATADIR%%/libs/jersey-media-jaxb-2.28.jar
-%%DATADIR%%/libs/jersey-server-2.28.jar
-%%DATADIR%%/libs/jetty-client-9.4.24.v20191120.jar
-%%DATADIR%%/libs/jetty-continuation-9.4.24.v20191120.jar
-%%DATADIR%%/libs/jetty-http-9.4.24.v20191120.jar
-%%DATADIR%%/libs/jetty-io-9.4.24.v20191120.jar
-%%DATADIR%%/libs/jetty-security-9.4.24.v20191120.jar
-%%DATADIR%%/libs/jetty-server-9.4.24.v20191120.jar
-%%DATADIR%%/libs/jetty-servlet-9.4.24.v20191120.jar
-%%DATADIR%%/libs/jetty-servlets-9.4.24.v20191120.jar
-%%DATADIR%%/libs/jetty-util-9.4.24.v20191120.jar
+%%DATADIR%%/libs/jersey-client-2.31.jar
+%%DATADIR%%/libs/jersey-common-2.31.jar
+%%DATADIR%%/libs/jersey-container-servlet-2.31.jar
+%%DATADIR%%/libs/jersey-container-servlet-core-2.31.jar
+%%DATADIR%%/libs/jersey-hk2-2.31.jar
+%%DATADIR%%/libs/jersey-media-jaxb-2.31.jar
+%%DATADIR%%/libs/jersey-server-2.31.jar
+%%DATADIR%%/libs/jetty-client-9.4.33.v20201020.jar
+%%DATADIR%%/libs/jetty-continuation-9.4.33.v20201020.jar
+%%DATADIR%%/libs/jetty-http-9.4.33.v20201020.jar
+%%DATADIR%%/libs/jetty-io-9.4.33.v20201020.jar
+%%DATADIR%%/libs/jetty-security-9.4.33.v20201020.jar
+%%DATADIR%%/libs/jetty-server-9.4.33.v20201020.jar
+%%DATADIR%%/libs/jetty-servlet-9.4.33.v20201020.jar
+%%DATADIR%%/libs/jetty-servlets-9.4.33.v20201020.jar
+%%DATADIR%%/libs/jetty-util-9.4.33.v20201020.jar
 %%DATADIR%%/libs/jopt-simple-5.0.4.jar
 %%DATADIR%%/libs/kafka-clients-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-log4j-appender-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-raft-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-examples-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-scala_2.13-%%PORTVERSION%%.jar
@@ -93,31 +96,30 @@
 %%DATADIR%%/libs/lz4-java-1.7.1.jar
 %%DATADIR%%/libs/maven-artifact-3.6.3.jar
 %%DATADIR%%/libs/metrics-core-2.2.0.jar
-%%DATADIR%%/libs/netty-buffer-4.1.50.Final.jar
-%%DATADIR%%/libs/netty-codec-4.1.50.Final.jar
-%%DATADIR%%/libs/netty-common-4.1.50.Final.jar
-%%DATADIR%%/libs/netty-handler-4.1.50.Final.jar
-%%DATADIR%%/libs/netty-resolver-4.1.50.Final.jar
-%%DATADIR%%/libs/netty-transport-4.1.50.Final.jar
-%%DATADIR%%/libs/netty-transport-native-epoll-4.1.50.Final.jar
-%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.50.Final.jar
-%%DATADIR%%/libs/osgi-resource-locator-1.0.1.jar
+%%DATADIR%%/libs/netty-buffer-4.1.51.Final.jar
+%%DATADIR%%/libs/netty-codec-4.1.51.Final.jar
+%%DATADIR%%/libs/netty-common-4.1.51.Final.jar
+%%DATADIR%%/libs/netty-handler-4.1.51.Final.jar
+%%DATADIR%%/libs/netty-resolver-4.1.51.Final.jar
+%%DATADIR%%/libs/netty-transport-4.1.51.Final.jar
+%%DATADIR%%/libs/netty-transport-native-epoll-4.1.51.Final.jar
+%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.51.Final.jar
+%%DATADIR%%/libs/osgi-resource-locator-1.0.3.jar
 %%DATADIR%%/libs/paranamer-2.8.jar
 %%DATADIR%%/libs/plexus-utils-3.2.1.jar
 %%DATADIR%%/libs/reflections-0.9.12.jar
 %%DATADIR%%/libs/rocksdbjni-5.18.4.jar
-%%DATADIR%%/libs/scala-collection-compat_2.13-2.1.6.jar
+%%DATADIR%%/libs/scala-collection-compat_2.13-2.2.0.jar
 %%DATADIR%%/libs/scala-java8-compat_2.13-0.9.1.jar
-%%DATADIR%%/libs/scala-library-2.13.2.jar
+%%DATADIR%%/libs/scala-library-2.13.3.jar
 %%DATADIR%%/libs/scala-logging_2.13-3.9.2.jar
-%%DATADIR%%/libs/scala-reflect-2.13.2.jar
+%%DATADIR%%/libs/scala-reflect-2.13.3.jar
 %%DATADIR%%/libs/slf4j-api-1.7.30.jar
 %%DATADIR%%/libs/slf4j-log4j12-1.7.30.jar
-%%DATADIR%%/libs/snappy-java-1.1.7.3.jar
-%%DATADIR%%/libs/validation-api-2.0.1.Final.jar
+%%DATADIR%%/libs/snappy-java-1.1.7.7.jar
 %%DATADIR%%/libs/zookeeper-3.5.8.jar
 %%DATADIR%%/libs/zookeeper-jute-3.5.8.jar
-%%DATADIR%%/libs/zstd-jni-1.4.4-7.jar
+%%DATADIR%%/libs/zstd-jni-1.4.5-6.jar
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/connect.html
@@ -202,6 +204,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-interactive-queries-api-02.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-session-windows-01.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-session-windows-02.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-sliding-windows.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-stateful_operations.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-duality-01.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-duality-02.png
@@ -218,7 +221,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/migration.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/ops.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/protocol.html
-%%PORTDOCS%%%%DOCSDIR%%/site-docs/quickstart.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/quickstart-docker.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/quickstart-zookeeper.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/security.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/architecture.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/core-concepts.html