diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile
index 29e6984dda6b..2615dd2843a5 100644
--- a/textproc/opensearch/Makefile
+++ b/textproc/opensearch/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	opensearch
 DISTVERSION?=	2.17.1
+PORTREVISION?=	1
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
@@ -15,7 +16,7 @@ BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash>0:shells/bash \
 		jna>0:devel/jna
 
-CONFLICTS?=	opensearch13 opensearch210 opensearch213
+CONFLICTS?=	opensearch13 opensearch210 opensearch213 opensearch216
 
 USES=		cpe java shebangfix
 JAVA_VERSION=	17+
@@ -44,7 +45,7 @@ PLUGINS_CONFIG_FILES?= \
 		opensearch-notifications-core/notifications-core.yml \
 		opensearch-notifications/notifications.yml \
 		opensearch-observability/observability.yml
-.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213"
+.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" || ${PKGNAMESUFFIX} == "216"
 PLUGINS_CONFIG_FILES+=	\
 		opensearch-performance-analyzer/agent-stats-metadata \
 		opensearch-performance-analyzer/log4j2.xml \
@@ -114,7 +115,7 @@ do-install-PLUGINS-on:
 		 ${STAGEDIR}${ETCDIR}/opensearch-observability \
 		 ${STAGEDIR}${ETCDIR}/opensearch-reports-scheduler \
 		 ${STAGEDIR}${ETCDIR}/opensearch-security
-.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213"
+.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" || ${PKGNAMESUFFIX} == "216"
 	${MKDIR} ${STAGEDIR}${ETCDIR}/opensearch-performance-analyzer
 .endif
 
@@ -142,7 +143,7 @@ post-install:
 	${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-notifications-core" >> ${TMPPLIST}
 	${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-notifications" >> ${TMPPLIST}
 	${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-observability" >> ${TMPPLIST}
-.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213"
+.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" || ${PKGNAMESUFFIX} == "216"
 	${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-performance-analyzer" >> ${TMPPLIST}
 .endif
 	${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-reports-scheduler" >> ${TMPPLIST}