diff --git a/www/tikiwiki/Makefile b/www/tikiwiki/Makefile
index 1f9e5bce4fb9..cc676938fcbc 100644
--- a/www/tikiwiki/Makefile
+++ b/www/tikiwiki/Makefile
@@ -1,49 +1,39 @@
 # Created by: Babak Farrokhi <babak@farrokhi.net>
 # $FreeBSD$
 
 PORTNAME=	tikiwiki
-PORTVERSION=	13.1
+PORTVERSION=	14.1
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME}/Tiki_13.x_Fomalhaut/${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/Tiki_14.x_Peony/${PORTVERSION}/
 DISTNAME=	tiki-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful PHP based Wiki/CMS/Groupware
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 USE_PHP=	gettext pcre posix session xml zlib
 WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
 NO_MTREE=	yes
 TIKIWIKI_DIR?=	www/${PORTNAME}-${PORTVERSION}
 SUB_FILES=	pkg-message
-SUB_LIST+=	PORTNAME=${PORTNAME} TIKIWIKI_DIR=${TIKIWIKI_DIR}
-
-post-extract:
-	@${FIND} ${WRKSRC} -name '.DS_Store' -o -name '.git' | ${XARGS} ${RM} -rf
+SUB_LIST+=	TIKIWIKI_DIR=${TIKIWIKI_DIR}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TIKIWIKI_DIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${TIKIWIKI_DIR})
 
 # pkg-plist would be over 15,000 lines, consuming 1.1Mb
 # The benefits of a fixed pkg-plist aren't worth it, autogen!
 
 post-install:
-	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
-		${SORT} >> ${TMPPLIST})
-	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
-	@${ECHO_CMD} "@group" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/lib/test/core/Profile" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/permissioncheck/meta_755" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/permissioncheck/meta_775" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/permissioncheck/meta_777" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/vendor_extra/elfinder/files" >> ${TMPPLIST}
+		${SORT} | ${SED} -e 's/^/@(${WWWOWN},${WWWGRP},) /' >> ${TMPPLIST})
+	@(cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty | \
+		${SORT} -r | ${SED} -e 's/^/@dir /' >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/www/tikiwiki/distinfo b/www/tikiwiki/distinfo
index fe55f85465c5..d3669c90eea3 100644
--- a/www/tikiwiki/distinfo
+++ b/www/tikiwiki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tiki-13.1.tar.gz) = 8eff5bd7d885e54e948c771c0b0f6e92a7b5494e5b951c922208141639129a33
-SIZE (tiki-13.1.tar.gz) = 54640100
+SHA256 (tiki-14.1.tar.gz) = bcca2e72d89a5c11d32fad4e741c71c3b8d2c2bd4c29601d58c17864345037b2
+SIZE (tiki-14.1.tar.gz) = 48436906
diff --git a/www/tikiwiki/files/pkg-message.in b/www/tikiwiki/files/pkg-message.in
index eaa5e1881f28..623e93a7e1f6 100644
--- a/www/tikiwiki/files/pkg-message.in
+++ b/www/tikiwiki/files/pkg-message.in
@@ -1,15 +1,15 @@
 =================================================================
           	**** NOTE ****
 1) Please add the following to your apache config, and restart.
     #
     # Directives to allow use of tikiwiki
     #
-    Alias /%%PORTNAME%% "%%PREFIX%%/%%TIKIWIKI_DIR%%/"
+    Alias /tikiwiki "%%PREFIX%%/%%TIKIWIKI_DIR%%/"
 
 2) Open the following page in your browser and follow the instructions:
     http://www.your.host/tikiwiki/
 
   For FULL configuration instructions see
   http://http://doc.tiki.org/Tiki+Installation+Guide
 
 =================================================================