diff --git a/net-mgmt/rrdbot/Makefile b/net-mgmt/rrdbot/Makefile
index 2817af97dd6b..15dec0c7fc29 100644
--- a/net-mgmt/rrdbot/Makefile
+++ b/net-mgmt/rrdbot/Makefile
@@ -1,34 +1,36 @@
 PORTNAME=	rrdbot
 PORTVERSION=	0.9.7.d20200312
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Threaded SNMP polling daemon which stores data in RRDs
 WWW=		https://github.com/REANNZ/rrdbot/
 
-LIB_DEPENDS=	librrd.so:databases/rrdtool
-
-USES=		autoreconf
-
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include \
-			--datarootdir=${PREFIX}/share/rrdbot
-
-SUB_FILES=	pkg-message
-USE_RC_SUBR=	rrdbot
+LIB_DEPENDS=	librrd.so:databases/rrdtool
 
+USES=		autoreconf
 USE_GITHUB=	YES
 GH_ACCOUNT=	REANNZ
 GH_TAGNAME=	396ca60
+USE_RC_SUBR=	rrdbot
+
+GNU_CONFIGURE=			yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+CONFIGURE_ARGS=			--datarootdir=${PREFIX}/share/rrdbot \
+				--includedir=${LOCALBASE}/include \
+				--libdir=${LOCALBASE}/lib
+
+SUB_FILES=	pkg-message
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/rrdbot/pkg-plist b/net-mgmt/rrdbot/pkg-plist
index 9c3fc243f7f0..57b03d2cadf1 100644
--- a/net-mgmt/rrdbot/pkg-plist
+++ b/net-mgmt/rrdbot/pkg-plist
@@ -1,63 +1,63 @@
 sbin/rrdbot-create
 sbin/rrdbot-get
 sbin/rrdbotd
 %%DATADIR%%/mib/AGENTX-MIB.txt
 %%DATADIR%%/mib/BEGEMOT-MIB.txt
 %%DATADIR%%/mib/BGP4-MIB.txt
 %%DATADIR%%/mib/BRIDGE-MIB.txt
 %%DATADIR%%/mib/DISMAN-SCHEDULE-MIB.txt
 %%DATADIR%%/mib/DISMAN-SCRIPT-MIB.txt
 %%DATADIR%%/mib/EtherLike-MIB.txt
 %%DATADIR%%/mib/FOKUS-MIB.txt
 %%DATADIR%%/mib/GNOME-SMI.txt
 %%DATADIR%%/mib/HCNUM-TC.txt
 %%DATADIR%%/mib/HOST-RESOURCES-MIB.txt
 %%DATADIR%%/mib/HOST-RESOURCES-TYPES.txt
 %%DATADIR%%/mib/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
 %%DATADIR%%/mib/IANA-LANGUAGE-MIB.txt
 %%DATADIR%%/mib/IANAifType-MIB.txt
 %%DATADIR%%/mib/JAILS-MIB.txt
 %%DATADIR%%/mib/IF-INVERTED-STACK-MIB.txt
 %%DATADIR%%/mib/IF-MIB.txt
 %%DATADIR%%/mib/INET-ADDRESS-MIB.txt
 %%DATADIR%%/mib/IP-FORWARD-MIB.txt
 %%DATADIR%%/mib/IP-MIB.txt
 %%DATADIR%%/mib/IPV6-ICMP-MIB.txt
 %%DATADIR%%/mib/IPV6-MIB.txt
 %%DATADIR%%/mib/IPV6-TC.txt
 %%DATADIR%%/mib/IPV6-TCP-MIB.txt
 %%DATADIR%%/mib/IPV6-UDP-MIB.txt
 %%DATADIR%%/mib/LM-SENSORS-MIB.txt
 %%DATADIR%%/mib/NOTIFICATION-LOG-MIB.txt
 %%DATADIR%%/mib/OSPF-MIB.txt
 %%DATADIR%%/mib/PCAP-MIB.txt
 %%DATADIR%%/mib/REGEX-MIB.txt
 %%DATADIR%%/mib/RFC-1215.txt
 %%DATADIR%%/mib/RFC1155-SMI.txt
 %%DATADIR%%/mib/RFC1213-MIB.txt
 %%DATADIR%%/mib/RIPv2-MIB.txt
 %%DATADIR%%/mib/RMON-MIB.txt
 %%DATADIR%%/mib/SMUX-MIB.txt
 %%DATADIR%%/mib/SNMP-COMMUNITY-MIB.txt
 %%DATADIR%%/mib/SNMP-FRAMEWORK-MIB.txt
 %%DATADIR%%/mib/SNMP-MPD-MIB.txt
 %%DATADIR%%/mib/SNMP-NOTIFICATION-MIB.txt
 %%DATADIR%%/mib/SNMP-PROXY-MIB.txt
 %%DATADIR%%/mib/SNMP-TARGET-MIB.txt
 %%DATADIR%%/mib/SNMP-USER-BASED-SM-MIB.txt
 %%DATADIR%%/mib/SNMP-USM-AES-MIB.txt
 %%DATADIR%%/mib/SNMP-VIEW-BASED-ACM-MIB.txt
 %%DATADIR%%/mib/SNMPv2-CONF.txt
 %%DATADIR%%/mib/SNMPv2-MIB.txt
 %%DATADIR%%/mib/SNMPv2-SMI.txt
 %%DATADIR%%/mib/SNMPv2-TC.txt
 %%DATADIR%%/mib/SNMPv2-TM.txt
 %%DATADIR%%/mib/SOURCE-ROUTING-MIB.txt
 %%DATADIR%%/mib/UCD-SNMP-MIB.txt
 %%DATADIR%%/mib/TCP-MIB.txt
 %%DATADIR%%/mib/UDP-MIB.txt
-man/man1/rrdbot-get.1.gz
-man/man5/rrdbot.conf.5.gz
-man/man8/rrdbot-create.8.gz
-man/man8/rrdbotd.8.gz
+share/man/man1/rrdbot-get.1.gz
+share/man/man5/rrdbot.conf.5.gz
+share/man/man8/rrdbot-create.8.gz
+share/man/man8/rrdbotd.8.gz
 @dir %%ETCDIR%%