diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 1f85fc8fa442c..ba5e0876bf410 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 PKGNAMESUFFIX=	-node
 
@@ -35,6 +36,7 @@ SHEBANG_FILES=	node/bin/munindoc node/sbin/munin-node \
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
+MAKE_ENV=	MANDIR=${PREFIX}/share/man
 ALL_TARGET=	build-node build-plugins build/node/_bin/munin-async \
 		build/node/_bin/munin-asyncd
 INSTALL_TARGET=	install-node-prime install-async-prime install-plugins-prime
@@ -95,11 +97,11 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/plugins.conf \
 		${STAGEDIR}${ETCDIR}/plugins.conf.sample
 	(cd ${WRKSRC}/node/blib/bindoc; \
-		${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \
+		${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 ${STAGEDIR}${PREFIX}/share/man/man1; \
 	)
 	(cd ${WRKSRC}/build/doc; \
-		${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \
-		${INSTALL_MAN} munin.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \
+		${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5; \
+		${INSTALL_MAN} munin.8 ${STAGEDIR}${PREFIX}/share/man/man8; \
 	)
 	${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-node.newsyslog
 
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index 8e4a3fd7bc4f4..5ad4b55d15e2a 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -26,31 +26,31 @@ bin/munindoc
 %%SITE_PERL%%/Munin/Plugin.pm
 %%SITE_PERL%%/Munin/Plugin/Pgsql.pm
 %%SITE_PERL%%/Munin/Plugin/SNMP.pm
-man/man1/munin-get.1.gz
-man/man1/munin-node-configure.1.gz
-man/man1/munin-node.1.gz
-man/man1/munin-run.1.gz
-man/man1/munindoc.1.gz
-man/man3/Munin::Node::Config.3.gz
-man/man3/Munin::Node::Configure::Debug.3.gz
-man/man3/Munin::Node::Configure::History.3.gz
-man/man3/Munin::Node::Configure::HostEnumeration.3.gz
-man/man3/Munin::Node::Configure::Plugin.3.gz
-man/man3/Munin::Node::Configure::PluginList.3.gz
-man/man3/Munin::Node::Logger.3.gz
-man/man3/Munin::Node::OS.3.gz
-man/man3/Munin::Node::SNMPConfig.3.gz
-man/man3/Munin::Node::Server.3.gz
-man/man3/Munin::Node::Service.3.gz
-man/man3/Munin::Node::Session.3.gz
-man/man3/Munin::Node::SpoolReader.3.gz
-man/man3/Munin::Node::SpoolWriter.3.gz
-man/man3/Munin::Node::Utils.3.gz
-man/man3/Munin::Plugin.3.gz
-man/man3/Munin::Plugin::Pgsql.3.gz
-man/man3/Munin::Plugin::SNMP.3.gz
-man/man5/munin-node.conf.5.gz
-man/man8/munin.8.gz
+share/man/man1/munin-get.1.gz
+share/man/man1/munin-node-configure.1.gz
+share/man/man1/munin-node.1.gz
+share/man/man1/munin-run.1.gz
+share/man/man1/munindoc.1.gz
+share/man/man3/Munin::Node::Config.3.gz
+share/man/man3/Munin::Node::Configure::Debug.3.gz
+share/man/man3/Munin::Node::Configure::History.3.gz
+share/man/man3/Munin::Node::Configure::HostEnumeration.3.gz
+share/man/man3/Munin::Node::Configure::Plugin.3.gz
+share/man/man3/Munin::Node::Configure::PluginList.3.gz
+share/man/man3/Munin::Node::Logger.3.gz
+share/man/man3/Munin::Node::OS.3.gz
+share/man/man3/Munin::Node::SNMPConfig.3.gz
+share/man/man3/Munin::Node::Server.3.gz
+share/man/man3/Munin::Node::Service.3.gz
+share/man/man3/Munin::Node::Session.3.gz
+share/man/man3/Munin::Node::SpoolReader.3.gz
+share/man/man3/Munin::Node::SpoolWriter.3.gz
+share/man/man3/Munin::Node::Utils.3.gz
+share/man/man3/Munin::Plugin.3.gz
+share/man/man3/Munin::Plugin::Pgsql.3.gz
+share/man/man3/Munin::Plugin::SNMP.3.gz
+share/man/man5/munin-node.conf.5.gz
+share/man/man8/munin.8.gz
 sbin/munin-node
 sbin/munin-node-configure
 sbin/munin-run