diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile
index 37a0f6d585ea..ccbc7d478665 100644
--- a/textproc/opensearch/Makefile
+++ b/textproc/opensearch/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	opensearch
-DISTVERSION=	2.2.1
+DISTVERSION?=	2.2.1
 DISTVERSIONSUFFIX=	-linux-x64
+PORTREVISION=	1
 CATEGORIES=	textproc java devel
-MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	opensearch@FreeBSD.org
-COMMENT=	Full-text search engine for Java
+COMMENT?=	Full-text search engine for Java
 WWW=		https://opensearch.org
 
 LICENSE=	APACHE20
@@ -14,6 +15,8 @@ BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash>0:shells/bash \
 		jna>0:devel/jna
 
+CONFLICTS?=	opensearch23 opensearch24
+
 USES=		cpe shebangfix
 USE_JAVA=	yes
 JAVA_VERSION=	11+
@@ -109,7 +112,11 @@ do-install-PLUGINS-on:
 		 ${STAGEDIR}${ETCDIR}/opensearch-reports-scheduler \
 		 ${STAGEDIR}${ETCDIR}/opensearch-security
 .for f in ${PLUGINS_CONFIG_FILES}
-	${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
+.	if ${PKGNAMESUFFIX} == 24
+		${INSTALL} ${WRKSRC}/config/${f:S/master/cluster_manager/} ${STAGEDIR}${ETCDIR}/${f:S/master/cluster_manager/}.sample
+.	else
+		${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
+.	endif
 	${ECHO} "@sample ${ETCDIR}/${f}.sample" >> ${TMPPLIST}
 .endfor
 .for f in ${PLUGINS_SAMPLE_CONFIG_FILES}