diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile
index 675ea900ddd6..3f70be9aeeba 100644
--- a/mail/couriergraph/Makefile
+++ b/mail/couriergraph/Makefile
@@ -1,60 +1,60 @@
-# Created by: Xavier Beaudouin (kiwi@oav.net)
+# Created by: Xavier Beaudouin <kiwi@oav.net>
 # $FreeBSD$
 
 PORTNAME=	couriergraph
 PORTVERSION=	20060202
 PORTREVISION=	3
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.oav.net/couriergraph/
-DIST_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://www.arschkrebs.de/postfix/${PORTNAME}/
+DISTNAME=	${PORTNAME}
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RRDtool frontend for Courier statistics
 
-RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool	\
+RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
 		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
 
-NO_BUILD=	yes
 USES=		perl5
+USE_PERL5=	run
+USE_RC_SUBR=	${PORTNAME}
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 DATADIR?=	/var/db/couriergraph
 COURIERGRAPH_USER?=	${WWWOWN}
 COURIERGRAPH_GROUP?=	${WWWGRP}
 
-USE_RC_SUBR=	${PORTNAME}
-SUB_LIST+=	COURIERGRAPH_USER=${COURIERGRAPH_USER} COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP}
-
+SUB_LIST=	COURIERGRAPH_USER=${COURIERGRAPH_USER} \
+		COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP}
 STARTUP_FILE=	${PREFIX}/etc/rc.d/couriergraph.sh
 
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You may set following options:"
+	@${ECHO_MSG} "You may set the following options:"
 	@${ECHO_MSG}
-	@${ECHO_MSG} "DATADIR=/var/db/couriergraph		Where do you put RRD databases?"
-	@${ECHO_MSG} "COURIERGRAPH_USER=www			User to run couriergraph (Default: ${WWWOWN})"
-	@${ECHO_MSG} "COURIERGRAPH_GROUP=www			Group to run couriergraph (Default: ${WWWGRP})"
+	@${ECHO_MSG} "DATADIR=/var/db/couriergraph	Where do you put RRD databases?"
+	@${ECHO_MSG} "COURIERGRAPH_USER=www		User to run couriergraph (default: ${WWWOWN})"
+	@${ECHO_MSG} "COURIERGRAPH_GROUP=www		Group to run couriergraph (default: ${WWWGRP})"
 	@${ECHO_MSG}
 
+# To avoid conflict between default WRKSRC and RC_SUBR file being the same
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph.cgi
-	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph.pl
+	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," \
+		${WRKSRC}/couriergraph.cgi ${WRKSRC}/couriergraph.pl
 
 do-install:
-	${MKDIR} ${PREFIX}/www/cgi-bin
-	${MKDIR} ${DATADIR}
-	@${CHOWN} -R ${COURIERGRAPH_USER}:${COURIERGRAPH_GROUP} ${DATADIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.pl ${PREFIX}/sbin
-	@${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.cgi ${PREFIX}/www/cgi-bin
-
-post-install:
-	@${ECHO}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${CHOWN} -R ${COURIERGRAPH_USER}:${COURIERGRAPH_GROUP} \
+		${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.pl \
+		${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.cgi \
+		${STAGEDIR}${PREFIX}/www/cgi-bin
 
 .include <bsd.port.mk>
diff --git a/mail/couriergraph/distinfo b/mail/couriergraph/distinfo
index 91aa52084671..deecc08ad75c 100644
--- a/mail/couriergraph/distinfo
+++ b/mail/couriergraph/distinfo
@@ -1,2 +1,2 @@
-SHA256 (couriergraph/couriergraph-20060202.tar.gz) = 3159948a122d808e90567a12ad7db4031b5e47e9ec6c7e90f6fc3283eb0cdc7f
-SIZE (couriergraph/couriergraph-20060202.tar.gz) = 7559
+SHA256 (couriergraph.tar.gz) = 3159948a122d808e90567a12ad7db4031b5e47e9ec6c7e90f6fc3283eb0cdc7f
+SIZE (couriergraph.tar.gz) = 7559
diff --git a/mail/couriergraph/files/couriergraph.in b/mail/couriergraph/files/couriergraph.in
index 74066d09f56b..82297160f005 100644
--- a/mail/couriergraph/files/couriergraph.in
+++ b/mail/couriergraph/files/couriergraph.in
@@ -23,7 +23,7 @@ stop_postcmd=stop_postcmd
 
 stop_postcmd()
 {
-    rm -f $pidfile
+	rm -f $pidfile
 }
 
 couriergraph_enable=${couriergraph_enable:-"NO"}
diff --git a/mail/couriergraph/files/pkg-message.in b/mail/couriergraph/files/pkg-message.in
index a1db11731f14..4b1a445b7230 100644
--- a/mail/couriergraph/files/pkg-message.in
+++ b/mail/couriergraph/files/pkg-message.in
@@ -1,8 +1,7 @@
 Make sure this script should be invoked with privilege to read
 /var/log/maillog.
 
-
 *** WARNING ***
 
-The rrd database has been moved to %%DATADIR%%.
+The RRD database has been moved to %%DATADIR%%.
 If you have previous ones, please move them to %%DATADIR%%.
diff --git a/mail/couriergraph/pkg-descr b/mail/couriergraph/pkg-descr
index 02f9f4eaf963..c752203a9976 100644
--- a/mail/couriergraph/pkg-descr
+++ b/mail/couriergraph/pkg-descr
@@ -2,4 +2,4 @@ Couriergraph is a very simple mail statistics RRDtool frontend for Postfix
 that produces daily, weekly, monthly and yearly graphs of Courier's POP3,
 IMAP, POP3s and IMAPs logins.
 
-WWW: http://www.stahl.bau.tu-bs.de/~hildeb/postfix/couriergraph/
+WWW: http://www.arschkrebs.de/postfix/couriergraph/