diff --git a/textproc/apache-poi/Makefile b/textproc/apache-poi/Makefile
index 5b888003ce14..e2da304a40f3 100644
--- a/textproc/apache-poi/Makefile
+++ b/textproc/apache-poi/Makefile
@@ -1,44 +1,59 @@
 PORTNAME=	poi
-PORTVERSION=	5.2.3
+PORTVERSION=	5.2.5
 CATEGORIES=	textproc devel java
-MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/release/bin/
+MASTER_SITES=	${MAVEN_SITE}/poi/${PORTVERSION}/:poi	\
+		${MAVEN_SITE}/poi-examples/${PORTVERSION}/:examples	\
+		${MAVEN_SITE}/poi-excelant/${PORTVERSION}/:excelant	\
+		${MAVEN_SITE}/poi-ooxml/${PORTVERSION}/:ooxml		\
+		${MAVEN_SITE}/poi-ooxml-full/${PORTVERSION}/:ooxmlfull	\
+		${MAVEN_SITE}/poi-ooxml-lite/${PORTVERSION}/:ooxmllite	\
+		${MAVEN_SITE}/poi-scratchpad/${PORTVERSION}/:scratchpad
 PKGNAMEPREFIX=	apache-
-DISTNAME=	${PORTNAME}-bin-${PORTVERSION}-${RELEASE_DATE}
+DISTFILES=	${PORTNAME}-${PORTVERSION}.jar:poi	\
+		${PORTNAME}-examples-${PORTVERSION}.jar:examples	\
+		${PORTNAME}-excelant-${PORTVERSION}.jar:excelant	\
+		${PORTNAME}-ooxml-${PORTVERSION}.jar:ooxml		\
+		${PORTNAME}-ooxml-full-${PORTVERSION}.jar:ooxmlfull	\
+		${PORTNAME}-ooxml-lite-${PORTVERSION}.jar:ooxmllite	\
+		${PORTNAME}-scratchpad-${PORTVERSION}.jar:scratchpad
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java API To Access Microsoft Format Files
 WWW=		https://poi.apache.org/
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKDIR}/META-INF/LICENSE
 
-RUN_DEPENDS=	log4j>0:devel/log4j	\
+RUN_DEPENDS=	apache-log4j2>0:devel/apache-log4j2	\
 		SparseBitSet>0:devel/sparsebitset	\
 		apache-commons-io>0:devel/apache-commons-io	\
 		apache-commons-math>0:math/apache-commons-math	\
 		apache-commons-codec>0:java/apache-commons-codec	\
 		apache-commons-collections4>0:java/apache-commons-collections4
 
-USES=		cpe tar:tgz
+USES=		cpe
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
 NO_BUILD=	yes
+NO_EXTRACT=	yes
 NO_ARCH=	yes
-RELEASE_DATE=	20220909
-JARNAMES=	examples excelant javadoc ooxml ooxml-full ooxml-lite scratchpad
-WRKSRC=		${WRKDIR}/${PORTNAME}-bin-${PORTVERSION}
+JARNAMES=	examples excelant ooxml ooxml-full ooxml-lite scratchpad
+
+MAVEN_SITE=	https://repo1.maven.org/maven2/org/apache/poi
 
 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
 
 .for i in ${JARNAMES}
 PLIST_FILES+=	${JAVAJARDIR}/${PORTNAME}-${i}.jar
 .endfor
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+	${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 .for i in ${JARNAMES}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${i}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${i}.jar
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-${i}-${PORTVERSION}.jar	\
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${i}.jar
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/apache-poi/distinfo b/textproc/apache-poi/distinfo
index f61bb4a70689..aabe187ab1b7 100644
--- a/textproc/apache-poi/distinfo
+++ b/textproc/apache-poi/distinfo
@@ -1,3 +1,15 @@
-TIMESTAMP = 1666382771
-SHA256 (poi-bin-5.2.3-20220909.tgz) = 2c09ba08b853a07b0b775a2e8f103d92fa17d8a5fd1950b12256a0397b3aa403
-SIZE (poi-bin-5.2.3-20220909.tgz) = 60984074
+TIMESTAMP = 1706983042
+SHA256 (poi-5.2.5.jar) = 352e1b44a5777af2df3d7dc408cda9f75f932d0e0125fa1a7d336a13c0a663a7
+SIZE (poi-5.2.5.jar) = 2976945
+SHA256 (poi-examples-5.2.5.jar) = 710d48b1cab6fb775f97d2813fe5a710b5650b5529fb7b23cd09891e249621b3
+SIZE (poi-examples-5.2.5.jar) = 389398
+SHA256 (poi-excelant-5.2.5.jar) = 976d3c48f94ad2563ad371f50cdd62f51fbc11689318b026a8e4e1cfd3fb3de6
+SIZE (poi-excelant-5.2.5.jar) = 28484
+SHA256 (poi-ooxml-5.2.5.jar) = c6ad01a10cefa1d2a9c1b552bd4293a3eca29b513353f1ec814041d38da9ec5b
+SIZE (poi-ooxml-5.2.5.jar) = 2027116
+SHA256 (poi-ooxml-full-5.2.5.jar) = 4ef28c69a3dd06d39ccb1e62a08f40e71bec5f96fcd6fbb7ed3ebf7883b4e215
+SIZE (poi-ooxml-full-5.2.5.jar) = 13947614
+SHA256 (poi-ooxml-lite-5.2.5.jar) = 6d4ce6736c422c52e47ffbfa08c784e1b8c188efb69583ac001a0ab16022d774
+SIZE (poi-ooxml-lite-5.2.5.jar) = 5946257
+SHA256 (poi-scratchpad-5.2.5.jar) = 233b279830c8c68ce57b3202164d5bcee53850a770883c4674cfb8d3dd52fc56
+SIZE (poi-scratchpad-5.2.5.jar) = 1906440