diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 1f85fc8fa442..ba5e0876bf41 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -1,106 +1,108 @@
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 PKGNAMESUFFIX=	-node
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	Node-specific part of Munin
 WWW=		https://munin-monitoring.org/
 
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash \
 		munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
 		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
 		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
 		p5-Module-Build>=0:devel/p5-Module-Build \
 		p5-Net-Server>=0:net/p5-Net-Server
 RUN_DEPENDS=	bash:shells/bash \
 		munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
 		p5-Cache-Cache>=0:devel/p5-Cache-Cache \
 		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
 		p5-libwww>=0:www/p5-libwww \
 		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
 		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
 		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
 		p5-Net-Server>=0:net/p5-Net-Server
 
 USES=		cpe gmake perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	munin-monitoring
 USE_RC_SUBR=	munin-asyncd munin-node
 
 SHEBANG_FILES=	node/bin/munindoc node/sbin/munin-node \
 		node/sbin/munin-node-configure node/sbin/munin-run
 
 .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
 REINPLACE_ARGS=	-i ""
 NO_ARCH=	yes
 
 PORTSCOUT=	ignore:1
 
 SUB_FILES=	pkg-message plugins.conf
 
 OPTIONS_DEFINE=		JAVA PERL PYTHON SNMP
 OPTIONS_DEFAULT=	PERL PYTHON SNMP
 OPTIONS_SUB=		yes
 
 JAVA_DESC=	Include JAVA plugins
 PERL_DESC=	Include all Perl modules (adds dependencies)
 PYTHON_DESC=	Include Python plugins
 SNMP_DESC=	Include SNMP plugins
 
 JAVA_USE=		JAVA=yes
 JAVA_INSTALL_TARGET=	install-plugins-java
 JAVA_VARS=		JAVA_BUILD=yes \
 			JAVA_RUN=yes
 
 PERL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
 			p5-Net-DNS>=0:dns/p5-Net-DNS \
 			p5-Net-IP>=0:net-mgmt/p5-Net-IP \
 			p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
 			p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 PYTHON_USES=	python
 
 SNMP_BUILD_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 SNMP_RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/node/sbin/munin-node \
 		${WRKSRC}/node/sbin/munin-node-configure \
 		${WRKSRC}/node/sbin/munin-run
 	@${RM}  ${WRKSRC}/node/sbin/munin-node.bak \
 		${WRKSRC}/node/sbin/munin-node-configure.bak \
 		${WRKSRC}/node/sbin/munin-run.bak
 	@${REINPLACE_CMD} \
 		-e 's|^\(BASH[[:space:]]*:=\).*|\1 ${bash_CMD}|' \
 		-e 's|^\(JAVARUN[[:space:]]*:=\).*|\1 ${java_CMD}|' \
 		-e 's|^\(PERL[[:space:]]*:=\).*|\1 ${perl_CMD}|' \
 		-e 's|^\(PYTHON[[:space:]]*:=\).*|\1 ${python_CMD}|' \
 		-e 's|^\(RUBY[[:space:]]*:=\).*|\1 ${ruby_CMD}|' \
 		${WRKSRC}/Makefile.config
 	@${FIND} ${WRKSRC}/node/sbin -type f -name "*.orig" -delete
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state ${STAGEDIR}${SPOOLDIR}/async
 	${INSTALL_SCRIPT} ${.CURDIR}/plugins/* ${STAGEDIR}${DATADIR}/plugins/
 	${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \
 		${STAGEDIR}${ETCDIR}/munin-node.conf.sample
 	${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
 
 .include <bsd.port.mk>
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index 8e4a3fd7bc4f..5ad4b55d15e2 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -1,258 +1,258 @@
 bin/munin-get
 bin/munindoc
 @sample %%ETCDIR%%/munin-node.conf.sample
 @dir %%ETCDIR%%/plugin-conf.d
 @sample %%ETCDIR%%/plugins.conf.sample %%ETCDIR%%/plugin-conf.d/plugins.conf
 @comment the directory exists in STAGEDIR because it is present in
 @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.conf
 %%SITE_PERL%%/Munin/Node/Config.pm
 %%SITE_PERL%%/Munin/Node/Configure/Debug.pm
 %%SITE_PERL%%/Munin/Node/Configure/History.pm
 %%SITE_PERL%%/Munin/Node/Configure/HostEnumeration.pm
 %%SITE_PERL%%/Munin/Node/Configure/Plugin.pm
 %%SITE_PERL%%/Munin/Node/Configure/PluginList.pm
 %%SITE_PERL%%/Munin/Node/Logger.pm
 %%SITE_PERL%%/Munin/Node/OS.pm
 %%SITE_PERL%%/Munin/Node/SNMPConfig.pm
 %%SITE_PERL%%/Munin/Node/Server.pm
 %%SITE_PERL%%/Munin/Node/Service.pm
 %%SITE_PERL%%/Munin/Node/Session.pm
 %%SITE_PERL%%/Munin/Node/SpoolReader.pm
 %%SITE_PERL%%/Munin/Node/SpoolWriter.pm
 %%SITE_PERL%%/Munin/Node/Utils.pm
 %%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
 %%DATADIR%%/munin-async
 %%DATADIR%%/munin-asyncd
 %%JAVA%%%%DATADIR%%/munin-jmx-plugins.jar
 %%DATADIR%%/plugins/amavis
 %%DATADIR%%/plugins/apache_accesses
 %%DATADIR%%/plugins/apache_processes
 %%DATADIR%%/plugins/apache_volume
 %%DATADIR%%/plugins/apc_envunit_
 %%DATADIR%%/plugins/apc_nis
 %%DATADIR%%/plugins/bind9
 %%DATADIR%%/plugins/bind9_rndc
 %%DATADIR%%/plugins/cmc_tc_sensor_
 %%DATADIR%%/plugins/coretemp
 %%DATADIR%%/plugins/courier_
 %%DATADIR%%/plugins/courier_mta_mailqueue
 %%DATADIR%%/plugins/courier_mta_mailstats
 %%DATADIR%%/plugins/courier_mta_mailvolume
 %%DATADIR%%/plugins/cpu
 %%DATADIR%%/plugins/cupsys_pages
 %%DATADIR%%/plugins/dev_cpu_
 %%DATADIR%%/plugins/df
 %%DATADIR%%/plugins/df_inode
 %%DATADIR%%/plugins/dhcpd3
 %%DATADIR%%/plugins/digitemp_
 %%DATADIR%%/plugins/ejabberd_
 %%DATADIR%%/plugins/exim_mailqueue
 %%DATADIR%%/plugins/exim_mailqueue_alt
 %%DATADIR%%/plugins/exim_mailstats
 %%DATADIR%%/plugins/fail2ban
 %%DATADIR%%/plugins/foldingathome
 %%DATADIR%%/plugins/foldingathome_rank
 %%DATADIR%%/plugins/foldingathome_wu
 %%DATADIR%%/plugins/freeradius_acct
 %%DATADIR%%/plugins/freeradius_auth
 %%DATADIR%%/plugins/freeradius_proxy_acct
 %%DATADIR%%/plugins/freeradius_proxy_auth
 %%DATADIR%%/plugins/haproxy_
 %%DATADIR%%/plugins/haproxy_ng
 %%DATADIR%%/plugins/hddtemp
 %%DATADIR%%/plugins/hddtemp2
 %%DATADIR%%/plugins/hddtemp_smartctl
 %%DATADIR%%/plugins/hddtempd
 %%PERL%%%%DATADIR%%/plugins/hp2000_
 %%DATADIR%%/plugins/http_loadtime
 %%DATADIR%%/plugins/if_
 %%DATADIR%%/plugins/if_errcoll_
 %%DATADIR%%/plugins/if_packets_
 %%DATADIR%%/plugins/ifx_concurrent_sessions_
 %%DATADIR%%/plugins/iostat
 %%DATADIR%%/plugins/ipac-ng
 %%DATADIR%%/plugins/ipmi_
 %%PYTHON%%%%DATADIR%%/plugins/ipmi_sensor_
 %%DATADIR%%/plugins/ircu
 %%JAVA%%%%DATADIR%%/plugins/jmx_
 %%JAVA%%%%DATADIR%%/plugins/jmx_tomcat_dbpools
 %%DATADIR%%/plugins/load
 %%DATADIR%%/plugins/loggrep
 %%DATADIR%%/plugins/lpstat
 %%DATADIR%%/plugins/mailman
 %%DATADIR%%/plugins/mailscanner
 %%DATADIR%%/plugins/mbmon_
 %%DATADIR%%/plugins/memcached_
 %%DATADIR%%/plugins/memory
 %%DATADIR%%/plugins/mhttping
 %%DATADIR%%/plugins/multiping
 %%DATADIR%%/plugins/multips
 %%DATADIR%%/plugins/multips_memory
 %%DATADIR%%/plugins/munin_stats
 %%DATADIR%%/plugins/munin_update
 %%DATADIR%%/plugins/mysql_
 %%DATADIR%%/plugins/mysql_bytes
 %%DATADIR%%/plugins/mysql_innodb
 %%DATADIR%%/plugins/mysql_isam_space_
 %%DATADIR%%/plugins/mysql_queries
 %%DATADIR%%/plugins/mysql_slowqueries
 %%DATADIR%%/plugins/mysql_threads
 %%DATADIR%%/plugins/named
 %%DATADIR%%/plugins/netopia
 %%DATADIR%%/plugins/netstat
 %%DATADIR%%/plugins/nginx_request
 %%DATADIR%%/plugins/nginx_status
 %%DATADIR%%/plugins/nomadix_users_
 %%PERL%%%%DATADIR%%/plugins/ntp_
 %%DATADIR%%/plugins/ntp_kernel_err
 %%DATADIR%%/plugins/ntp_kernel_pll_freq
 %%DATADIR%%/plugins/ntp_kernel_pll_off
 %%DATADIR%%/plugins/ntp_offset
 %%PERL%%%%DATADIR%%/plugins/ntp_states
 %%DATADIR%%/plugins/nut_misc
 %%DATADIR%%/plugins/nut_volts
 %%DATADIR%%/plugins/nutups_
 %%DATADIR%%/plugins/nvidia_
 %%DATADIR%%/plugins/open_files
 %%DATADIR%%/plugins/openvpn
 %%DATADIR%%/plugins/perdition
 %%PERL%%%%DATADIR%%/plugins/pgbouncer_connections
 %%PERL%%%%DATADIR%%/plugins/pgbouncer_requests
 %%DATADIR%%/plugins/ping_
 %%DATADIR%%/plugins/plugin.sh
 %%DATADIR%%/plugins/plugins.history
 %%DATADIR%%/plugins/pm3users_
 %%DATADIR%%/plugins/pop_stats
 %%DATADIR%%/plugins/postfix_mailqueue
 %%DATADIR%%/plugins/postfix_mailstats
 %%DATADIR%%/plugins/postfix_mailvolume
 %%PERL%%%%DATADIR%%/plugins/postgres_autovacuum
 %%PERL%%%%DATADIR%%/plugins/postgres_bgwriter
 %%PERL%%%%DATADIR%%/plugins/postgres_cache_
 %%PERL%%%%DATADIR%%/plugins/postgres_checkpoints
 %%PERL%%%%DATADIR%%/plugins/postgres_connections_
 %%PERL%%%%DATADIR%%/plugins/postgres_connections_db
 %%PERL%%%%DATADIR%%/plugins/postgres_locks_
 %%PERL%%%%DATADIR%%/plugins/postgres_oldest_prepared_xact_
 %%PERL%%%%DATADIR%%/plugins/postgres_prepared_xacts_
 %%PERL%%%%DATADIR%%/plugins/postgres_querylength_
 %%PERL%%%%DATADIR%%/plugins/postgres_scans_
 %%PERL%%%%DATADIR%%/plugins/postgres_size_
 %%PERL%%%%DATADIR%%/plugins/postgres_streaming_
 %%PERL%%%%DATADIR%%/plugins/postgres_transactions_
 %%PERL%%%%DATADIR%%/plugins/postgres_tuples_
 %%PERL%%%%DATADIR%%/plugins/postgres_users
 %%PERL%%%%DATADIR%%/plugins/postgres_xlog
 %%DATADIR%%/plugins/processes
 %%DATADIR%%/plugins/proxy_plugin
 %%DATADIR%%/plugins/ps_
 %%DATADIR%%/plugins/psu_
 %%DATADIR%%/plugins/qmailqstat
 %%DATADIR%%/plugins/qmailscan
 %%DATADIR%%/plugins/qmailscan-simple
 %%DATADIR%%/plugins/samba
 %%DATADIR%%/plugins/sendmail_mailqueue
 %%DATADIR%%/plugins/sendmail_mailstats
 %%DATADIR%%/plugins/sendmail_mailtraffic
 %%DATADIR%%/plugins/slapd_
 %%DATADIR%%/plugins/slapd_bdb_cache_
 %%PERL%%%%DATADIR%%/plugins/slony_lag_
 %%PYTHON%%%%DATADIR%%/plugins/smart_
 %%SNMP%%%%DATADIR%%/plugins/snmp__cpuload
 %%SNMP%%%%DATADIR%%/plugins/snmp__df
 %%SNMP%%%%DATADIR%%/plugins/snmp__df_ram
 %%SNMP%%%%DATADIR%%/plugins/snmp__fc_if_
 %%SNMP%%%%DATADIR%%/plugins/snmp__fc_if_err_
 %%SNMP%%%%DATADIR%%/plugins/snmp__if_
 %%SNMP%%%%DATADIR%%/plugins/snmp__if_err_
 %%SNMP%%%%DATADIR%%/plugins/snmp__if_multi
 %%SNMP%%%%DATADIR%%/plugins/snmp__load
 %%SNMP%%%%DATADIR%%/plugins/snmp__memory
 %%SNMP%%%%DATADIR%%/plugins/snmp__netapp_diskusage_
 %%SNMP%%%%DATADIR%%/plugins/snmp__netapp_inodeusage_
 %%SNMP%%%%DATADIR%%/plugins/snmp__netstat
 %%SNMP%%%%DATADIR%%/plugins/snmp__print_pages
 %%SNMP%%%%DATADIR%%/plugins/snmp__print_supplies
 %%SNMP%%%%DATADIR%%/plugins/snmp__processes
 %%SNMP%%%%DATADIR%%/plugins/snmp__rdp_users
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_bx_fan
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_bx_temp
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_fan
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_temp
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_fan
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_temp
 %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_volt
 %%SNMP%%%%DATADIR%%/plugins/snmp__swap
 %%SNMP%%%%DATADIR%%/plugins/snmp__uptime
 %%SNMP%%%%DATADIR%%/plugins/snmp__users
 %%SNMP%%%%DATADIR%%/plugins/snmp__winload
 %%SNMP%%%%DATADIR%%/plugins/snmp__winmem
 %%DATADIR%%/plugins/snort_alerts
 %%DATADIR%%/plugins/snort_bytes_pkt
 %%DATADIR%%/plugins/snort_drop_rate
 %%DATADIR%%/plugins/snort_pattern_match
 %%DATADIR%%/plugins/snort_pkts
 %%DATADIR%%/plugins/snort_traffic
 %%DATADIR%%/plugins/spamstats
 %%DATADIR%%/plugins/squeezebox_
 %%DATADIR%%/plugins/squid_cache
 %%DATADIR%%/plugins/squid_icp
 %%DATADIR%%/plugins/squid_objectsize
 %%DATADIR%%/plugins/squid_requests
 %%DATADIR%%/plugins/squid_traffic
 %%DATADIR%%/plugins/surfboard
 %%DATADIR%%/plugins/swap
 %%DATADIR%%/plugins/sybase_space
 %%DATADIR%%/plugins/systat
 %%DATADIR%%/plugins/tomcat_
 %%DATADIR%%/plugins/tomcat_access
 %%DATADIR%%/plugins/tomcat_jvm
 %%DATADIR%%/plugins/tomcat_threads
 %%DATADIR%%/plugins/tomcat_volume
 %%DATADIR%%/plugins/uptime
 %%DATADIR%%/plugins/users
 %%PERL%%%%DATADIR%%/plugins/varnish_
 %%DATADIR%%/plugins/vmstat
 %%DATADIR%%/plugins/zfs_arc_compression
 %%DATADIR%%/plugins/zfs_compress
 %%DATADIR%%/plugins/zimbra_
 %%DATADIR%%/plugins/zpool_chksum
 %%DATADIR%%/plugins/zpool_dedup
 @dir(%%USER%%,%%GROUP%%,) %%DBDIRNODE%%/plugin-state
 @dir %%ETCDIR%%/plugins
 @dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%/async
 @comment @dir %%SPOOLDIR%%
 @comment @dir %%DBDIRNODE%%