diff --git a/www/pmwiki/Makefile b/www/pmwiki/Makefile
index 9b1a35f69499..a6003653f5dd 100644
--- a/www/pmwiki/Makefile
+++ b/www/pmwiki/Makefile
@@ -1,52 +1,51 @@
 PORTNAME=	pmwiki
-PORTVERSION=	2.5.4
+DISTVERSION=	2.5.8
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.pmwiki.org/pub/pmwiki/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	m.ne@gmx.net
 COMMENT=	WikiWikiWeb clone using PHP
 WWW=		https://www.pmwiki.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.txt
 
 USES=		cpe tar:tgz php:web
 USE_PHP=	mbstring session
 
-NO_BUILD=	yes
 NO_ARCH=	yes
-
-PORTDOCS=	*
-
-PLIST_SUB=	PMWIKIDIR=${PMWIKIDIR} WWWGRP=${WWWGRP} WWWOWN=${WWWOWN}
-SUB_LIST+=	PMWIKIDIR=${PMWIKIDIR}
+NO_BUILD=	yes
 SUB_FILES=	pkg-message
+SUB_LIST=	PMWIKIDIR=${PMWIKIDIR}
+PLIST_SUB=	PMWIKIDIR=${PMWIKIDIR} WWWGRP=${WWWGRP} WWWOWN=${WWWOWN}
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 pre-fetch:
 .if !defined(PMWIKIDIR)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Define PMWIKIDIR (now: ${PMWIKIDIR})"
 	@${ECHO_MSG} "to override default: www/pmwiki".
 	@${ECHO_MSG} ""
 .endif
 
 PMWIKIDIR?=	www/pmwiki
 
 CPIOFLAGS=	--quiet -pdm -R ${WWWOWN}:${WWWGRP}
 
 post-extract:
 	@${MV} ${WRKSRC}/README.txt ${WRKSRC}/docs
 	@${MV} ${WRKSRC}/docs/sample-config.php ${WRKSRC}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${PMWIKIDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${PMWIKIDIR}/wiki.d
 	@cd ${WRKSRC} && ${FIND} . ! \( -name docs -prune \) | \
 		${CPIO} ${CPIOFLAGS} ${STAGEDIR}${PREFIX}/${PMWIKIDIR}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${PMWIKIDIR}/wiki.d
 
 .include <bsd.port.mk>
diff --git a/www/pmwiki/distinfo b/www/pmwiki/distinfo
index 2bd8a0bc8f8a..4baefe640ca1 100644
--- a/www/pmwiki/distinfo
+++ b/www/pmwiki/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1767831513
-SHA256 (pmwiki-2.5.4.tgz) = ddd2963616c38edc0aab949e566e18d1b18ede96883b9eed4692a2441949cc42
-SIZE (pmwiki-2.5.4.tgz) = 571627
+TIMESTAMP = 1773216917
+SHA256 (pmwiki-2.5.8.tgz) = c736eb91c6b08fe76a0e4f75f1bb0d412f4b2cee3a92f080c60106e8e78dd6a4
+SIZE (pmwiki-2.5.8.tgz) = 581186