diff --git a/net/kafka/Makefile b/net/kafka/Makefile
index 3baafd24b018..071168c1bfd0 100644
--- a/net/kafka/Makefile
+++ b/net/kafka/Makefile
@@ -1,102 +1,115 @@
 PORTNAME=	kafka
-DISTVERSION=	3.1.0
+DISTVERSION=	3.3.1
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_2.13-${PORTVERSION}
 
 MAINTAINER=	timp87@gmail.com
 COMMENT=	Distributed streaming platform
 WWW=		https://kafka.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe shebangfix tar:tgz
 CPE_VENDOR=	apache
 
-SHEBANG_FILES=	bin/*.sh
+USE_JAVA=	yes
+JAVA_VERSION=	11+
+JAVA_RUN=	jre
 
-OPTIONS_DEFINE=	DOCS
+USE_RC_SUBR=	kafka kafka_connect
+
+SHEBANG_FILES=	bin/*.sh
 
 KAFKA_USER?=	kafka
 KAFKA_GROUP?=	kafka
 KAFKA_DBDIR?=	/var/db/${PORTNAME}
 KAFKA_LOGDIR?=	/var/log/${PORTNAME}
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+SUB_FILES=	pkg-message
+SUB_LIST=	JAVA=${JAVA} \
+		KAFKA_USER=${KAFKA_USER} \
+		KAFKA_GROUP=${KAFKA_GROUP} \
+		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
+		KAFKA_DBDIR=${KAFKA_DBDIR}
 USERS=		${KAFKA_USER}
 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-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-features.sh kafka-get-offsets.sh \
 		kafka-leader-election.sh kafka-log-dirs.sh \
+		kafka-metadata-quorum.sh kafka-metadata-shell.sh \
 		kafka-mirror-maker.sh kafka-producer-perf-test.sh \
 		kafka-reassign-partitions.sh kafka-replica-verification.sh \
 		kafka-run-class.sh kafka-server-start.sh kafka-server-stop.sh \
 		kafka-storage.sh kafka-streams-application-reset.sh \
 		kafka-topics.sh kafka-transactions.sh \
 		kafka-verifiable-consumer.sh kafka-verifiable-producer.sh \
 		trogdor.sh zookeeper-security-migration.sh zookeeper-shell.sh
 KAFKA_CONFIGS=	connect-console-sink.properties \
 		connect-console-source.properties \
 		connect-distributed.properties connect-file-sink.properties \
-		connect-file-source.properties \
-		connect-log4j.properties connect-mirror-maker.properties \
-		connect-standalone.properties consumer.properties \
-		log4j.properties producer.properties server.properties \
-		tools-log4j.properties trogdor.conf
-
-USE_RC_SUBR=	kafka kafka_connect
-SUB_LIST=	JAVA=${JAVA} \
-		KAFKA_USER=${KAFKA_USER} \
-		KAFKA_GROUP=${KAFKA_GROUP} \
-		KAFKA_LOGDIR=${KAFKA_LOGDIR}
+		connect-file-source.properties connect-log4j.properties \
+		connect-mirror-maker.properties connect-standalone.properties \
+		consumer.properties log4j.properties producer.properties \
+		server.properties tools-log4j.properties trogdor.conf
+KAFKA_KRAFT=	broker.properties controller.properties server.properties
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		KAFKA_USER=${KAFKA_USER} \
 		KAFKA_GROUP=${KAFKA_GROUP} \
 		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
 		KAFKA_DBDIR=${KAFKA_DBDIR}
 
-NO_BUILD=	yes
-NO_ARCH=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	8+
-JAVA_RUN=	yes
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} "s|JAVA=\"java\"|JAVA=\"${JAVA}\"|" ${WRKSRC}/bin/kafka-run-class.sh
 	@${REINPLACE_CMD} "/LOG_DIR=/s|\$$base_dir/logs|${KAFKA_LOGDIR}|" ${WRKSRC}/bin/kafka-run-class.sh
 	@${REINPLACE_CMD} "s|\$$base_dir.*/config|${ETCDIR}|" ${WRKSRC}/bin/*.sh
 	@${REINPLACE_CMD} "s|ps ax|ps axww|" ${WRKSRC}/bin/kafka-server-stop.sh
 	@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}|" ${WRKSRC}/config/server.properties
+.for f in ${KAFKA_KRAFT}
+	@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}/kraft/|" ${WRKSRC}/config/kraft/${f}
+.endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${ETCDIR}/kraft
 	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}
+	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}/kraft
 	${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 .for f in ${KAFKA_BINS}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${DATADIR}/bin/
 .endfor
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} libs ${STAGEDIR}${DATADIR} "-not ( \
 		-name kafka_*-javadoc\.jar -or -name kafka_*-scaladoc\.jar -or \
 		-name kafka_*-sources\.jar -or -name kafka_*-test\.jar -or \
 		-name *\.asc )" \
 	)
 .for f in ${KAFKA_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
+.for f in ${KAFKA_KRAFT}
+	${INSTALL_DATA} ${WRKSRC}/config/kraft/${f} ${STAGEDIR}${ETCDIR}/kraft/${f}.sample
+.endfor
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${EXTRACT_CMD} -xf ${WRKSRC}/site-docs/${PORTNAME}_2.13-${PORTVERSION}-site-docs.tgz -C ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/kafka/distinfo b/net/kafka/distinfo
index 6ca10bdc3ba4..d53e511b1ce1 100644
--- a/net/kafka/distinfo
+++ b/net/kafka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642864304
-SHA256 (kafka_2.13-3.1.0.tgz) = 3fd643f16d11ccdb81a7b296f305d7fa0ae6c9e39e1a701bac56929e2e4d6710
-SIZE (kafka_2.13-3.1.0.tgz) = 88130011
+TIMESTAMP = 1665443581
+SHA256 (kafka_2.13-3.3.1.tgz) = 18ad8a365fb111de249d3bb8bf3c96cd1af060ec8fb3e3d1fc4a7ae10d9042de
+SIZE (kafka_2.13-3.3.1.tgz) = 105053134
diff --git a/net/kafka/files/pkg-message.in b/net/kafka/files/pkg-message.in
new file mode 100644
index 000000000000..f5f0fe1b65a0
--- /dev/null
+++ b/net/kafka/files/pkg-message.in
@@ -0,0 +1,12 @@
+[
+{ type: install
+  message: <<EOM
+    Kafka KRaft mode is marked as production ready since v3.3.1.
+    If you want to start using KRaft mode be aware that there are
+    separate configs in %%ETCDIR%%/kraft directory.
+    The data logs will be stored in %%KAFKA_DBDIR%%/kraft directory by default.
+    So set kafka_config="%%ETCDIR%%/kraft/server.properties" in /etc/rc.conf
+    to get started with KRaft mode.
+EOM
+}
+]
diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist
index 1431cdc40fe6..206622d584de 100644
--- a/net/kafka/pkg-plist
+++ b/net/kafka/pkg-plist
@@ -1,275 +1,289 @@
 %%DATADIR%%/bin/connect-distributed.sh
 %%DATADIR%%/bin/connect-mirror-maker.sh
 %%DATADIR%%/bin/connect-standalone.sh
 %%DATADIR%%/bin/kafka-acls.sh
 %%DATADIR%%/bin/kafka-broker-api-versions.sh
+%%DATADIR%%/bin/kafka-cluster.sh
 %%DATADIR%%/bin/kafka-configs.sh
 %%DATADIR%%/bin/kafka-console-consumer.sh
 %%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
 %%DATADIR%%/bin/kafka-features.sh
 %%DATADIR%%/bin/kafka-get-offsets.sh
 %%DATADIR%%/bin/kafka-leader-election.sh
 %%DATADIR%%/bin/kafka-log-dirs.sh
+%%DATADIR%%/bin/kafka-metadata-quorum.sh
+%%DATADIR%%/bin/kafka-metadata-shell.sh
 %%DATADIR%%/bin/kafka-mirror-maker.sh
 %%DATADIR%%/bin/kafka-producer-perf-test.sh
 %%DATADIR%%/bin/kafka-reassign-partitions.sh
 %%DATADIR%%/bin/kafka-replica-verification.sh
 %%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-transactions.sh
 %%DATADIR%%/bin/kafka-verifiable-consumer.sh
 %%DATADIR%%/bin/kafka-verifiable-producer.sh
 %%DATADIR%%/bin/trogdor.sh
 %%DATADIR%%/bin/zookeeper-security-migration.sh
 %%DATADIR%%/bin/zookeeper-shell.sh
 %%DATADIR%%/libs/activation-1.1.1.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
+%%DATADIR%%/libs/commons-lang3-3.12.0.jar
 %%DATADIR%%/libs/commons-lang3-3.8.1.jar
 %%DATADIR%%/libs/connect-api-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-basic-auth-extension-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-file-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-json-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-mirror-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-mirror-client-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-runtime-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-transforms-%%PORTVERSION%%.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.12.3.jar
-%%DATADIR%%/libs/jackson-core-2.12.3.jar
-%%DATADIR%%/libs/jackson-databind-2.12.3.jar
-%%DATADIR%%/libs/jackson-dataformat-csv-2.12.3.jar
-%%DATADIR%%/libs/jackson-datatype-jdk8-2.12.3.jar
-%%DATADIR%%/libs/jackson-jaxrs-base-2.12.3.jar
-%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.12.3.jar
-%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.12.3.jar
-%%DATADIR%%/libs/jackson-module-scala_2.13-2.12.3.jar
-%%DATADIR%%/libs/jakarta.activation-api-1.2.1.jar
+%%DATADIR%%/libs/jackson-annotations-2.13.3.jar
+%%DATADIR%%/libs/jackson-core-2.13.3.jar
+%%DATADIR%%/libs/jackson-databind-2.13.3.jar
+%%DATADIR%%/libs/jackson-dataformat-csv-2.13.3.jar
+%%DATADIR%%/libs/jackson-datatype-jdk8-2.13.3.jar
+%%DATADIR%%/libs/jackson-jaxrs-base-2.13.3.jar
+%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.13.3.jar
+%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.13.3.jar
+%%DATADIR%%/libs/jackson-module-scala_2.13-2.13.3.jar
+%%DATADIR%%/libs/jakarta.activation-api-1.2.2.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/jakarta.xml.bind-api-2.3.3.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
 %%DATADIR%%/libs/jersey-client-2.34.jar
 %%DATADIR%%/libs/jersey-common-2.34.jar
 %%DATADIR%%/libs/jersey-container-servlet-2.34.jar
 %%DATADIR%%/libs/jersey-container-servlet-core-2.34.jar
 %%DATADIR%%/libs/jersey-hk2-2.34.jar
 %%DATADIR%%/libs/jersey-server-2.34.jar
-%%DATADIR%%/libs/jetty-client-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-continuation-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-http-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-io-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-security-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-server-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-servlet-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-servlets-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-util-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-util-ajax-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jline-3.12.1.jar
+%%DATADIR%%/libs/jetty-client-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-continuation-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-http-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-io-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-security-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-server-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-servlet-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-servlets-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-util-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-util-ajax-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jline-3.21.0.jar
 %%DATADIR%%/libs/jopt-simple-5.0.4.jar
-%%DATADIR%%/libs/jose4j-0.7.8.jar
+%%DATADIR%%/libs/jose4j-0.7.9.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-server-common-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-shell-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-storage-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-storage-api-%%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
 %%DATADIR%%/libs/kafka-streams-test-utils-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-tools-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka_2.13-%%PORTVERSION%%.jar
-%%DATADIR%%/libs/log4j-1.2.17.jar
 %%DATADIR%%/libs/lz4-java-1.8.0.jar
-%%DATADIR%%/libs/maven-artifact-3.8.1.jar
+%%DATADIR%%/libs/maven-artifact-3.8.4.jar
 %%DATADIR%%/libs/metrics-core-2.2.0.jar
 %%DATADIR%%/libs/metrics-core-4.1.12.1.jar
-%%DATADIR%%/libs/netty-buffer-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-codec-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-common-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-handler-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-resolver-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-transport-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-transport-native-epoll-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.68.Final.jar
+%%DATADIR%%/libs/netty-buffer-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-codec-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-common-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-handler-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-resolver-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-transport-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-transport-classes-epoll-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-transport-native-epoll-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.78.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/plexus-utils-3.3.0.jar
 %%DATADIR%%/libs/reflections-0.9.12.jar
-%%DATADIR%%/libs/rocksdbjni-6.22.1.1.jar
-%%DATADIR%%/libs/scala-collection-compat_2.13-2.4.4.jar
-%%DATADIR%%/libs/scala-java8-compat_2.13-1.0.0.jar
-%%DATADIR%%/libs/scala-library-2.13.6.jar
-%%DATADIR%%/libs/scala-logging_2.13-3.9.3.jar
-%%DATADIR%%/libs/scala-reflect-2.13.6.jar
-%%DATADIR%%/libs/trogdor-%%PORTVERSION%%.jar
-%%DATADIR%%/libs/slf4j-api-1.7.30.jar
-%%DATADIR%%/libs/slf4j-log4j12-1.7.30.jar
+%%DATADIR%%/libs/reload4j-1.2.19.jar
+%%DATADIR%%/libs/rocksdbjni-6.29.4.1.jar
+%%DATADIR%%/libs/scala-collection-compat_2.13-2.6.0.jar
+%%DATADIR%%/libs/scala-java8-compat_2.13-1.0.2.jar
+%%DATADIR%%/libs/scala-library-2.13.8.jar
+%%DATADIR%%/libs/scala-logging_2.13-3.9.4.jar
+%%DATADIR%%/libs/scala-reflect-2.13.8.jar
+%%DATADIR%%/libs/slf4j-api-1.7.36.jar
+%%DATADIR%%/libs/slf4j-reload4j-1.7.36.jar
 %%DATADIR%%/libs/snappy-java-1.1.8.4.jar
+%%DATADIR%%/libs/swagger-annotations-2.2.0.jar
+%%DATADIR%%/libs/trogdor-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/zookeeper-3.6.3.jar
 %%DATADIR%%/libs/zookeeper-jute-3.6.3.jar
-%%DATADIR%%/libs/zstd-jni-1.5.0-4.jar
+%%DATADIR%%/libs/zstd-jni-1.5.2-1.jar
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/connect.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/design.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/index.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/architecture.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/core-concepts.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/app-reset-tool.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/config-streams.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/datatypes.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/dsl-api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/dsl-topology-naming.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/index.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/interactive-queries.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/manage-topics.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/memory-mgmt.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/processor-api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/running-app.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/security.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/testing.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/developer-guide/write-streams.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/index.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/upgrade-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/ecosystem.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/admin_client_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_metrics.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_predicates.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_rest.yaml
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_transforms.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/consumer_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/consumer_metrics.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/kafka_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/producer_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/producer_metrics.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_api_keys.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_errors.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_messages.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_types.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/sink_connector_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/source_connector_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/streams_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/topic_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/consumer-groups.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/creating-streams-iframe-placeholder.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/NYT.jpg
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/architecture--white.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/architecture.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/documentation--white.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/documentation.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/line.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/new-york.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/rabobank.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/tutorials--white.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/tutorials.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/zalando.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/intro_to_streams-iframe-placeholder.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka-apis.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_log.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc_complex.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_anatomy.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_cleaner_anatomy.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_compaction.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_consumer.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/mirror-maker.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/producer_consumer.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-overview.jpg
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-states.jpg
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-tasks.jpg
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-threads.jpg
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-topology.jpg
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-cache-and-commit-interval.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-concepts-topology.jpg
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-elastic-scaling-1.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-elastic-scaling-2.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-elastic-scaling-3.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-interactive-queries-01.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-interactive-queries-02.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-interactive-queries-03.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-interactive-queries-api-01.png
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-duality-03.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-updates-01.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-updates-02.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-time-windows-hopping.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-time-windows-tumbling.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-welcome.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/tracking_high_level.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/transforming_part_1-iframe-placeholder.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/transforming_part_2-iframe-placeholder.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/implementation.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/js/templateData.js
 %%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/security.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/architecture.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/core-concepts.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/app-reset-tool.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/config-streams.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/datatypes.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/dsl-api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/dsl-topology-naming.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/index.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/interactive-queries.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/manage-topics.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/memory-mgmt.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/processor-api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/running-app.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/security.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/testing.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/developer-guide/write-streams.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/index.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/streams/upgrade-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/toc.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/upgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/uses.html
 @sample %%ETCDIR%%/connect-console-sink.properties.sample
 @sample %%ETCDIR%%/connect-console-source.properties.sample
 @sample %%ETCDIR%%/connect-distributed.properties.sample
 @sample %%ETCDIR%%/connect-file-sink.properties.sample
 @sample %%ETCDIR%%/connect-file-source.properties.sample
-@sample %%ETCDIR%%/connect-mirror-maker.properties.sample
 @sample %%ETCDIR%%/connect-log4j.properties.sample
+@sample %%ETCDIR%%/connect-mirror-maker.properties.sample
 @sample %%ETCDIR%%/connect-standalone.properties.sample
 @sample %%ETCDIR%%/consumer.properties.sample
 @sample %%ETCDIR%%/log4j.properties.sample
 @sample %%ETCDIR%%/producer.properties.sample
 @sample %%ETCDIR%%/server.properties.sample
 @sample %%ETCDIR%%/tools-log4j.properties.sample
 @sample %%ETCDIR%%/trogdor.conf.sample
+@sample %%ETCDIR%%/kraft/broker.properties.sample
+@sample %%ETCDIR%%/kraft/controller.properties.sample
+@sample %%ETCDIR%%/kraft/server.properties.sample
 @dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%
+@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%/kraft
 @dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_LOGDIR%%