--- b/net/kafka/Makefile	
+++ b/net/kafka/Makefile	
@@ -1,5 +1,6 @@ 
 PORTNAME=	kafka
-PORTVERSION=	2.7.0
+PORTVERSION=	2.8.0
+
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}_2.13-${PORTVERSION}
@@ -29,13 +30,14 @@ GROUPS=		${KAFKA_GROUP}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 KAFKA_BINS=	connect-distributed.sh connect-mirror-maker.sh \
 		connect-standalone.sh kafka-acls.sh \
-		kafka-broker-api-versions.sh kafka-configs.sh \
+		kafka-broker-api-versions.sh kafka-cluster.sh kafka-configs.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-features.sh \
 		kafka-log-dirs.sh kafka-mirror-maker.sh \
-		kafka-preferred-replica-election.sh kafka-producer-perf-test.sh \
+		kafka-preferred-replica-election.sh \
+		kafka-producer-perf-test.sh kafka-storage.sh \
 		kafka-reassign-partitions.sh kafka-replica-verification.sh \
 		kafka-run-class.sh kafka-server-start.sh kafka-server-stop.sh \
 		kafka-streams-application-reset.sh kafka-topics.sh \
--- b/net/kafka/distinfo	
+++ b/net/kafka/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1612587168
-SHA256 (kafka_2.13-2.7.0.tgz) = 1dd84b763676a02fecb48fa5d7e7e94a2bf2be9ff87bce14cf14109ce1cb7f90
-SIZE (kafka_2.13-2.7.0.tgz) = 68583422
+TIMESTAMP = 1618924943
+SHA256 (kafka_2.13-2.8.0.tgz) = 3fa380ae5d1385111ee9c83b0d1806172924ffec2e29399fd1a42671a97492c6
+SIZE (kafka_2.13-2.8.0.tgz) = 71403603
--- b/net/kafka/pkg-plist	
+++ b/net/kafka/pkg-plist	
@@ -8,6 +8,7 @@ 
 %%DATADIR%%/bin/kafka-console-producer.sh
 %%DATADIR%%/bin/kafka-consumer-groups.sh
 %%DATADIR%%/bin/kafka-consumer-perf-test.sh
+%%DATADIR%%/bin/kafka-cluster.sh
 %%DATADIR%%/bin/kafka-delegation-tokens.sh
 %%DATADIR%%/bin/kafka-delete-records.sh
 %%DATADIR%%/bin/kafka-dump-log.sh
@@ -22,6 +23,7 @@ 
 %%DATADIR%%/bin/kafka-run-class.sh
 %%DATADIR%%/bin/kafka-server-start.sh
 %%DATADIR%%/bin/kafka-server-stop.sh
+%%DATADIR%%/bin/kafka-storage.sh
 %%DATADIR%%/bin/kafka-streams-application-reset.sh
 %%DATADIR%%/bin/kafka-topics.sh
 %%DATADIR%%/bin/kafka-verifiable-consumer.sh
@@ -61,8 +63,7 @@ 
 %%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.25.0-GA.jar
-%%DATADIR%%/libs/javassist-3.26.0-GA.jar
+%%DATADIR%%/libs/javassist-3.27.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
@@ -73,19 +74,23 @@ 
 %%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/jetty-client-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jetty-continuation-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jetty-http-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jetty-io-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jetty-security-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jetty-server-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jetty-servlet-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jetty-servlets-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jetty-util-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jetty-util-ajax-9.4.39.v20210325.jar
+%%DATADIR%%/libs/jline-3.12.1.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-metadata-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-raft-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-shell-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-examples-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-scala_2.13-%%PORTVERSION%%.jar
@@ -96,30 +101,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.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/netty-buffer-4.1.62.Final.jar
+%%DATADIR%%/libs/netty-codec-4.1.62.Final.jar
+%%DATADIR%%/libs/netty-common-4.1.62.Final.jar
+%%DATADIR%%/libs/netty-handler-4.1.62.Final.jar
+%%DATADIR%%/libs/netty-resolver-4.1.62.Final.jar
+%%DATADIR%%/libs/netty-transport-4.1.62.Final.jar
+%%DATADIR%%/libs/netty-transport-native-epoll-4.1.62.Final.jar
+%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.62.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.2.0.jar
+%%DATADIR%%/libs/scala-collection-compat_2.13-2.3.0.jar
 %%DATADIR%%/libs/scala-java8-compat_2.13-0.9.1.jar
-%%DATADIR%%/libs/scala-library-2.13.3.jar
+%%DATADIR%%/libs/scala-library-2.13.5.jar
 %%DATADIR%%/libs/scala-logging_2.13-3.9.2.jar
-%%DATADIR%%/libs/scala-reflect-2.13.3.jar
+%%DATADIR%%/libs/scala-reflect-2.13.5.jar
 %%DATADIR%%/libs/slf4j-api-1.7.30.jar
 %%DATADIR%%/libs/slf4j-log4j12-1.7.30.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.5-6.jar
+%%DATADIR%%/libs/snappy-java-1.1.8.1.jar
+%%DATADIR%%/libs/zookeeper-3.5.9.jar
+%%DATADIR%%/libs/zookeeper-jute-3.5.9.jar
+%%DATADIR%%/libs/zstd-jni-1.4.9-1.jar
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/connect.html
@@ -221,8 +226,7 @@ 
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/migration.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/ops.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/protocol.html
-%%PORTDOCS%%%%DOCSDIR%%/site-docs/quickstart-docker.html
-%%PORTDOCS%%%%DOCSDIR%%/site-docs/quickstart-zookeeper.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/security.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/architecture.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/core-concepts.html