diff --git a/www/mattermost-server/Makefile b/www/mattermost-server/Makefile
index 326906ca7d72..d9ccb84d9423 100644
--- a/www/mattermost-server/Makefile
+++ b/www/mattermost-server/Makefile
@@ -1,57 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	mattermost-server
 PORTVERSION=	4.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
 MAINTAINER=	loic.blot@unix-experience.fr
 COMMENT=	Open source Slack-alternative in Golang and React
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
 
 BUILD_DEPENDS=	go>=1.8.1:lang/go
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		mattermost-webapp>=${PORTVERSION}:www/mattermost-webapp
 
 GO_LDFLAGS=	-X github.com/mattermost/mattermost-server/model.BuildNumber=${PORTVERSION}
 
 USE_RC_SUBR=	mattermostd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mattermost:DEFAULT
 
 WWWDIR=		${PREFIX}/www/mattermost
 
 MATTERMOSTD_USER=	mattermost
 MATTERMOSTD_GROUP=	mattermost
 
 USERS=		${MATTERMOSTD_USER}
 GROUPS=		${MATTERMOSTD_GROUP}
 
-.include <bsd.port.pre.mk>
-
 pre-build:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 	@cd ${WRKSRC} && \
 		${MV} api api4 app cmd doc einterfaces imports jobs manualtesting \
 		model plugin store utils web wsapi vendor \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT} && \
 		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags="${GO_LDFLAGS}" ./...
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/platform ${STAGEDIR}${PREFIX}/bin/mattermostd
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mattermost
-	${CP} ${WRKSRC}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample
+	${INSTALL_DATA} ${WRKSRC}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample
 	${MKDIR} ${STAGEDIR}${WWWDIR}
-	${CP} -R ${WRKSRC}/fonts ${STAGEDIR}${WWWDIR}
-	${CP} -R ${WRKSRC}/i18n ${STAGEDIR}${WWWDIR}
-	${CP} -R ${WRKSRC}/templates ${STAGEDIR}${WWWDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} 'fonts i18n templates' ${STAGEDIR}${WWWDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mattermost-webapp/Makefile b/www/mattermost-webapp/Makefile
index bbb3ef631dbc..eb7c6f2ac848 100644
--- a/www/mattermost-webapp/Makefile
+++ b/www/mattermost-webapp/Makefile
@@ -1,35 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	mattermost-webapp
 PORTVERSION=	4.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	https://releases.mattermost.com/${PORTVERSION}/
 DISTNAME=	mattermost-${PORTVERSION}-linux-amd64
 
 MAINTAINER=	loic.blot@unix-experience.fr
 COMMENT=	Webapp of Mattermost server
 
 LICENSE=	APACHE20
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 WWWDIR=		${PREFIX}/www/mattermost
 
 MATTERMOSTD_USER=	mattermost
 MATTERMOSTD_GROUP=	mattermost
 
 USERS=		${MATTERMOSTD_USER}
 GROUPS=		${MATTERMOSTD_GROUP}
 
 PLIST_SUB=	MATTERMOSTD_USER=${MATTERMOSTD_USER} \
 			MATTERMOSTD_GROUP=${MATTERMOSTD_GROUP}
 
-.include <bsd.port.pre.mk>
-
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
-	${CP} -R ${WRKDIR}/mattermost/client ${STAGEDIR}${WWWDIR}
+	cd ${WRKDIR}/mattermost && ${COPYTREE_SHARE} client ${STAGEDIR}${WWWDIR}
 	${MKDIR} ${STAGEDIR}${WWWDIR}/client/plugins
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>