diff --git a/sysutils/apcctrl/Makefile b/sysutils/apcctrl/Makefile
index edf6e5bdbda8..f6a7abc93ecc 100644
--- a/sysutils/apcctrl/Makefile
+++ b/sysutils/apcctrl/Makefile
@@ -1,78 +1,79 @@
 PORTNAME=	apcctrl
 PORTVERSION=	0.8.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	lobo@bsd.com.br
 COMMENT=	Fork of apcupsd 3.14.x with support for Brazilian APC nobreaks
 WWW=		http://www.apcctrl.com.br
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--sbindir=${PREFIX}/sbin \
 		--with-nologin=/var/run \
 		--disable-install-distdir \
 		--sysconfdir=${ETCDIR}
 
 CONFIGURE_ENV+=	LD="${CXX}" \
 		ac_cv_path_SHUTDOWN="/sbin/shutdown"
 
 USE_RC_SUBR=	apcctrl
 SUB_FILES=	pkg-message
 
 CONFLICTS_INSTALL=	apcupsd
 
 OPTIONS_DEFINE=	APCDUMB_DRV APCSMART_DRV BRAZIL_DRV CGI GAPCMON MODBUS \
 		MODBUS_USB PCNET_DRV SHUTDOWN_POWEROFF SNMP_DRV SNMP_DRV_OLD \
 		TCP_WRAPPERS TEST_DRV USB_DRV
 OPTIONS_DEFAULT=	BRAZIL_DRV
 OPTIONS_SUB=	yes
 
 APCDUMB_DRV_DESC=	Dumb UPS driver support
 APCSMART_DRV_DESC=	APC SmartUPS serial driver support
 BRAZIL_DRV_DESC=	Brazilian APC-Microsol support
 CGI_DESC=		Build CGI programs to show status
 GAPCMON_DESC=		Build GTK GUI front-end
 MODBUS_DESC=		MODBUS driver support
 MODBUS_USB_DESC=	MODBUS USB driver support
 PCNET_DRV_DESC=		PowerChute Network Shutdown driver support
 SHUTDOWN_POWEROFF_DESC=	Shutdown behavior with Halt and Power off
 SNMP_DRV_DESC=		SNMP driver support
 SNMP_DRV_OLD_DESC=	Old SNMP driver support
 TCP_WRAPPERS_DESC=	${LIBWRAP_DESC}
 TEST_DRV_DESC=		Test driver support
 USB_DRV_DESC=		USB driver support
 
 APCDUMB_DRV_CONFIGURE_ENABLE=	dumb
 APCSMART_DRV_CONFIGURE_ENABLE=	apcsmart
 BRAZIL_DRV_CONFIGURE_ENABLE=	brazil
 CGI_CONFIGURE_ENABLE=		cgi
 CGI_CONFIGURE_ON=		--with-cgi-bin=${ETCDIR}/cgi
 CGI_LIB_DEPENDS=		libgd.so:graphics/gd
 GAPCMON_CONFIGURE_ENABLE=	gapcmon
 GAPCMON_USES=			gnome pkgconfig xorg
 GAPCMON_USE=			GNOME=cairo,gconf2,gdkpixbuf2 XORG=x11,xext
 GAPCMON_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
 				libfreetype.so:print/freetype2
 GAPCMON_CONFLICTS=		gapcmon
 MODBUS_CONFIGURE_ENABLE=	modbus
 MODBUS_USB_CONFIGURE_ENABLE=	modbus-usb
 PCNET_DRV_CONFIGURE_ENABLE=	pcnet
 SNMP_DRV_CONFIGURE_ENABLE=	snmp
 SNMP_DRV_OLD_CONFIGURE_ENABLE=	net-snmp
 SNMP_DRV_OLD_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 TCP_WRAPPERS_CONFIGURE_WITH=	libwrap=yes
 TEST_DRV_CONFIGURE_ENABLE=	test
 USB_DRV_CONFIGURE_ENABLE=	usb
 
 .include <bsd.port.options.mk>
 
 post-patch-SHUTDOWN_POWEROFF-on:
 	${REINPLACE_CMD} -e 's|-h now|-p now|' \
 		${WRKSRC}/platforms/freebsd/apccontrol.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/apcctrl/pkg-plist b/sysutils/apcctrl/pkg-plist
index 73c895c891ef..95abe39ccebe 100644
--- a/sysutils/apcctrl/pkg-plist
+++ b/sysutils/apcctrl/pkg-plist
@@ -1,30 +1,30 @@
 sbin/apcctrl
 sbin/apcaccess
 sbin/apctest
 @sample %%ETCDIR%%/apcctrl.conf.sample
 %%ETCDIR%%/apccontrol
 @sample %%ETCDIR%%/changeme.sample
 @sample %%ETCDIR%%/commfailure.sample
 @sample %%ETCDIR%%/commok.sample
 @sample %%ETCDIR%%/onbattery.sample
 @sample %%ETCDIR%%/offbattery.sample
 %%CGI%%@sample %%ETCDIR%%/apcctrl.css.sample
 %%CGI%%@sample %%ETCDIR%%/hosts.conf.sample
 %%CGI%%@sample %%ETCDIR%%/multimon.conf.sample
 %%CGI%%%%ETCDIR%%/cgi/multimon.cgi
 %%CGI%%%%ETCDIR%%/cgi/upsfstats.cgi
 %%CGI%%%%ETCDIR%%/cgi/upsimage.cgi
 %%CGI%%%%ETCDIR%%/cgi/upsstats.cgi
 %%GAPCMON%%bin/gapcmon
 %%GAPCMON%%share/applications/gapcmon.desktop
 %%GAPCMON%%share/pixmaps/apcctrl.png
 %%GAPCMON%%share/pixmaps/charging.png
 %%GAPCMON%%share/pixmaps/gapc_prefs.png
 %%GAPCMON%%share/pixmaps/onbatt.png
 %%GAPCMON%%share/pixmaps/online.png
 %%GAPCMON%%share/pixmaps/unplugged.png
-man/man5/apcctrl.conf.5.gz
-man/man8/apcaccess.8.gz
-man/man8/apccontrol.8.gz
-man/man8/apctest.8.gz
-man/man8/apcctrl.8.gz
+share/man/man5/apcctrl.conf.5.gz
+share/man/man8/apcaccess.8.gz
+share/man/man8/apccontrol.8.gz
+share/man/man8/apctest.8.gz
+share/man/man8/apcctrl.8.gz