Index: sysutils/munin-master/Makefile
===================================================================
--- sysutils/munin-master/Makefile
+++ sysutils/munin-master/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-master
Index: sysutils/munin-master/pkg-install
===================================================================
--- sysutils/munin-master/pkg-install
+++ sysutils/munin-master/pkg-install
@@ -60,7 +60,16 @@
     fi
 }
 
+move_newsyslog_conf() {
+	oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-master
+	newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-master.conf
+	if [ -f ${oldfile} ]; then
+		echo Migrating ${oldfile} to ${newfile}
+		mv -v ${oldfile} ${newfile}
+	fi
+}
 
+
 ########################################################################
 
 case $2 in
@@ -78,5 +87,6 @@
 #END_MUNIN_MAIN
 EOT
 	fi
+	move_newsyslog_conf
 	;;
 esac
Index: sysutils/munin-master/pkg-plist
===================================================================
--- sysutils/munin-master/pkg-plist
+++ sysutils/munin-master/pkg-plist
@@ -37,7 +37,7 @@
 @comment BSD.local.dist but if not registered here, it will not exist in PREFIX
 @comment when the package is installed.
 @dir etc/newsyslog.conf.d
-@sample %%ETCDIR%%/munin-master.newsyslog etc/newsyslog.conf.d/munin-master
+@sample %%ETCDIR%%/munin-master.newsyslog etc/newsyslog.conf.d/munin-master.conf
 %%SITE_PERL%%/Munin/Master/Config.pm
 %%SITE_PERL%%/Munin/Master/GraphOld.pm
 %%SITE_PERL%%/Munin/Master/Group.pm
Index: sysutils/munin-node/Makefile
===================================================================
--- sysutils/munin-node/Makefile
+++ sysutils/munin-node/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node
Index: sysutils/munin-node/pkg-install
===================================================================
--- sysutils/munin-node/pkg-install
+++ sysutils/munin-node/pkg-install
@@ -12,7 +12,16 @@
     echo "done."
 }
 
+move_newsyslog_conf() {
+	oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-node
+	newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-node.conf
+	if [ -f ${oldfile} ]; then
+		echo Migrating ${oldfile} to ${newfile}
+		mv -v ${oldfile} ${newfile}
+	fi
+}
 
+
 ########################################################################
 
 case $2 in
@@ -20,5 +29,6 @@
 	if [ -z "${PACKAGE_BUILDING}" ]; then
 		init_plugins
 	fi
+	move_newsyslog_conf
 	;;
 esac
Index: sysutils/munin-node/pkg-plist
===================================================================
--- sysutils/munin-node/pkg-plist
+++ sysutils/munin-node/pkg-plist
@@ -6,7 +6,7 @@
 @comment BSD.local.dist but if not registered here, it will not exist in PREFIX
 @comment when the package is installed.
 @dir etc/newsyslog.conf.d
-@sample %%ETCDIR%%/munin-node.newsyslog etc/newsyslog.conf.d/munin-node
+@sample %%ETCDIR%%/munin-node.newsyslog etc/newsyslog.conf.d/munin-node.conf
 %%SITE_PERL%%/Munin/Node/Config.pm
 %%SITE_PERL%%/Munin/Node/Configure/Debug.pm
 %%SITE_PERL%%/Munin/Node/Configure/History.pm