diff --git a/sysutils/data-prepper/Makefile b/sysutils/data-prepper/Makefile
index 3148dea..ebee8fe 100644
--- a/sysutils/data-prepper/Makefile
+++ b/sysutils/data-prepper/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	data-prepper
 DISTVERSION=	2.10.2
 DISTVERSIONSUFFIX=	-linux-x64
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils java
 MASTER_SITES=   https://artifacts.opensearch.org/${PORTNAME}/${DISTVERSION}/
-DISTNAME=	opensearch-${PORTNAME}-jdk-${DISTVERSION}${DISTVERSIONSUFFIX}
+DISTNAME=	opensearch-${PORTNAME}-jdk-${DISTVERSIONFULL}
+#DISTNAME=	opensearch-${PORTNAME}-jdk-${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	opensearch@FreeBSD.org
 COMMENT=	A server-side data collector for OpenSearch
@@ -15,7 +16,6 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	bash>0:shells/bash
 
 USES=		cpe shebangfix java
-# This ports works only with Java 17
 JAVA_VERSION=	17+
 USE_RC_SUBR=	${PORTNAME}
 
@@ -42,7 +42,8 @@ do-install:
 .for f in ${BINS}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${DATADIR}/bin
 .endfor
-	${MKDIR} ${STAGEDIR}${DATADIR}/examples
+	#${MKDIR} ${STAGEDIR}${DATADIR}/examples
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	${MKDIR} ${STAGEDIR}${DATADIR}/pipelines
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "examples lib pipelines" ${STAGEDIR}${DATADIR}/)
diff --git a/sysutils/data-prepper/pkg-plist b/sysutils/data-prepper/pkg-plist
index bcad51d..e4f618b 100644
--- a/sysutils/data-prepper/pkg-plist
+++ b/sysutils/data-prepper/pkg-plist
@@ -590,3 +590,4 @@ etc/rc.d/data-prepper
 %%DATADIR%%/lib/yasson-2.0.2.jar
 %%DATADIR%%/lib/zstd-jni-1.5.6-2.jar
 %%DATADIR%%/pipelines/README
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%