diff --git a/sysutils/monitorix/Makefile b/sysutils/monitorix/Makefile
index 15d3c26e4e08..1c1df052f055 100644
--- a/sysutils/monitorix/Makefile
+++ b/sysutils/monitorix/Makefile
@@ -1,125 +1,117 @@
 # New ports collection makefile for:	monitorix
 # Date created:				15 Aug 2010
 # Whom:					Olli Hauer <ohauer@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	monitorix
-PORTVERSION=	2.4.1
+PORTVERSION=	2.5.0
 PORTREVISION?=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.monitorix.org/ \
 		http://www.monitorix.org/old_versions/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	A web based monitoring system
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	rrd:${PORTSDIR}/databases/rrdtool
 RUN_DEPENDS=	p5-ParallelUA>=0:${PORTSDIR}/www/p5-ParallelUA \
 		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite
 
 USE_PERL5=	5.12+
 MAN5=		monitorix.conf.5
 MAN8=		monitorix.8
 MANCOMPRESSED=	no
 NO_BUILD=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 CGIDIR?=	www/cgi-bin
 CGIPATH?=	/cgi-bin
 WWW_OWNER?=	${WWWOWN}
 WWW_GROUP?=	${WWWGRP}
-REPORT_LANG=	ca de en it
+REPORT_LANG=	ca de en it pl
 WWWROOT=	${WWWDIR:S,/${PORTNAME}$,,}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PERL=${PERL}
 
 PLIST_SUB+=	CGIDIR=${CGIDIR} \
 		WWW_OWNER=${WWW_OWNER} \
 		WWW_GROUP=${WWW_GROUP}
 
 WWW_FILES=	logo_top.png \
 		logo_bot.png \
 		monitorixico.png
 
-PORTDOCS=	COPYING \
-		Changes \
-		README \
-		README.FreeBSD \
-		README.OpenBSD \
-		README.nginx \
-		monitorix-alert.sh \
-		monitorix-apache.conf
+PORTDOCS=	*
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may set following options:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "DATADIR=${DATADIR}	Where do you put RRD databases?"
 	@${ECHO_MSG} "CGIDIR=${CGIDIR}	Where do you put cgi?"
 	@${ECHO_MSG} "CGIPATH=${CGIPATH}	What is the relative URL for cgi files?"
 	@${ECHO_MSG} "WWWDIR=${WWWDIR}	Where do you put httpd's document root?"
 	@${ECHO_MSG} ""
 
 post-patch:
 .for f in monitorix.cgi monitorix.conf monitorix reports/send_reports
 	@${REINPLACE_CMD} -e "1s|^\(#!\).*|\1${PERL}|" \
 		${WRKSRC}/${f}
 .endfor
 # eth0 doesn't exist in FreeBSD! Also let's set our own paths.
 # No iptables, so we'll disable PORT_GRAPH
 	@${REINPLACE_CMD} \
 		-e 's|\($$BASE_DIR = "\)[^"]*|\1${WWWDIR}/|' \
 		-e 's|\($$BASE_LIB = "\)[^"]*|\1${DATADIR}/|' \
 		-e 's|\($$BASE_CGI = "\)[^"]*|\1${CGIPATH}/|' \
 		-e 's|\($$SECURE_LOG= "\)[^"]*|\1/var/log/auth.log|' \
 		-e "s|/var/lib/milter-greylist/db/|/var/milter-greylist/|" \
 		-e "s|eth0|lo0|g" \
 		-e 's|\("port"[^Y]*\)Y|\1N|' \
 			${WRKSRC}/monitorix.conf
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/monitorix ${PREFIX}/bin/
 	@${MKDIR} ${WWWDIR}/imgs
 	@${CHOWN} ${WWW_OWNER}:${WWW_GROUP} ${WWWDIR}/imgs
 .for f in ${WWW_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${WWWDIR}/
 .endfor
 	@${MKDIR} ${PREFIX}/${CGIDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/monitorix.cgi ${PREFIX}/${CGIDIR}/
-.for m in ${MAN5}
-	@${INSTALL_MAN} ${WRKSRC}/man/man5/$m ${MAN5PREFIX}/man/man5/
-.endfor
-.for m in ${MAN8}
-	@${INSTALL_MAN} ${WRKSRC}/man/man8/$m ${MAN8PREFIX}/man/man8/
+.for c in 5 8
+. for m in ${MAN$c}
+	@${INSTALL_MAN} ${WRKSRC}/man/man$c/$m ${MAN$cPREFIX}/man/man$c/
+. endfor
 .endfor
 	@${MKDIR} ${WWWDIR}/reports
 .for l in ${REPORT_LANG}
 	@${INSTALL_DATA} ${WRKSRC}/reports/${l}.html \
 		${WWWDIR}/reports/
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-. for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+. for f in docs/* README README.FreeBSD README.nginx Changes
+	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
 . endfor
 .endif
 
 post-install:
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${WWWDIR}/usage
 	@${INSTALL_DATA} ${WRKSRC}/monitorix.conf ${PREFIX}/etc/monitorix.conf.sample
 	@if [ ! -f ${PREFIX}/etc/monitorix.conf ]; then \
 		${CP} -p ${PREFIX}/etc/monitorix.conf.sample \
 			${PREFIX}/etc/monitorix.conf ; \
 	fi
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/monitorix/distinfo b/sysutils/monitorix/distinfo
index be7ff378a879..922f2779b978 100644
--- a/sysutils/monitorix/distinfo
+++ b/sysutils/monitorix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (monitorix-2.4.1.tar.gz) = a0f32f4b16beb4a3ade1763cdef642753f4b8480dae0fd577fa50247a2620f5f
-SIZE (monitorix-2.4.1.tar.gz) = 118500
+SHA256 (monitorix-2.5.0.tar.gz) = 0350e873a0bae6db7d76ceb6decd86bd4f0f81f36e2658f44d93f539695a2d36
+SIZE (monitorix-2.5.0.tar.gz) = 125419
diff --git a/sysutils/monitorix/pkg-plist b/sysutils/monitorix/pkg-plist
index 0aa0c1c9826f..0a4d7dc309cb 100644
--- a/sysutils/monitorix/pkg-plist
+++ b/sysutils/monitorix/pkg-plist
@@ -1,23 +1,23 @@
-@stopdaemon monitorix
 @exec mkdir -p %D/%%WWWDIR%%/imgs
 @exec chown %%WWW_OWNER%%:%%WWW_GROUP%% %D/%%WWWDIR%%/imgs
 @unexec if cmp -s %D/etc/monitorix.conf %D/etc/monitorix.conf.sample; then rm -f %D/etc/monitorix.conf; fi
 etc/monitorix.conf.sample
 @exec if [ ! -f %D/etc/monitorix.conf ]; then cp %B/%f %D/etc/monitorix.conf; fi
 bin/monitorix
 @exec mkdir -p %D/%%DATADIR%%
 @dirrmtry %%DATADIR%%
 @exec mkdir -p %D/%%WWWDIR%%/usage
 @dirrmtry %%WWWDIR%%/usage
 %%CGIDIR%%/monitorix.cgi
 @dirrmtry %%CGIDIR%%
 %%WWWDIR%%/reports/ca.html
 %%WWWDIR%%/reports/de.html
 %%WWWDIR%%/reports/en.html
 %%WWWDIR%%/reports/it.html
+%%WWWDIR%%/reports/pl.html
 @dirrm %%WWWDIR%%/reports
 %%WWWDIR%%/logo_bot.png
 %%WWWDIR%%/logo_top.png
 %%WWWDIR%%/monitorixico.png
 @dirrmtry %%WWWDIR%%/imgs
 @dirrmtry %%WWWDIR%%