diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index b17e9f57c8b..8030386c4d1 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -31,7 +31,7 @@ SUB_FILES=	pkg-message
 
 CONFLICTS_INSTALL=	apcctrl
 
-OPTIONS_DEFINE=	APCDUMB_DRV APCSMART_DRV CGI CLIENT_ONLY DOCS GAPCMON MODBUS \
+OPTIONS_DEFINE=	APCDUMB_DRV APCSMART_DRV CGI CLIENT_ONLY GAPCMON MODBUS \
 		MODBUS_USB PCNET_DRV SHUTDOWN_POWEROFF SNMP_DRV SNMP_DRV_OLD \
 		TCP_WRAPPERS TEST_DRV USB_DRV
 OPTIONS_DEFAULT=	APCDUMB_DRV APCSMART_DRV MODBUS MODBUS_USB PCNET_DRV \
@@ -62,9 +62,11 @@ CLIENT_ONLY_CONFIGURE_ON=	--enable-net \
 				--disable-apcsmart --disable-dumb --disable-usb \
 				--disable-snmp --disable-test --disable-pcnet
 GAPCMON_CONFIGURE_ENABLE=	gapcmon
-GAPCMON_USES=			pkgconfig
-GAPCMON_USE=			GNOME=gconf2
-GAPCMON_CONFLICTS=		gapcmon-[0-9]*
+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
diff --git a/sysutils/apcupsd/files/apcupsd.conf.net-slave.sample b/sysutils/apcupsd/files/apcupsd.conf.net-slave.sample
deleted file mode 100644
index 5913eef01a8..00000000000
--- a/sysutils/apcupsd/files/apcupsd.conf.net-slave.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-## apcupsd.conf v1.1 ##
-#
-#  apcupsd 3.10.X
-#
-# "apcupsd" netslave file
-#
-UPSCABLE ether
-UPSTYPE net
-DEVICE usv.koellers.net:3551
-LOCKFILE /var/spool/lock
-EVENTSFILE /var/log/apcupsd.events
-UPSCLASS standalone
-UPSMODE disable
-NISPORT		3551
-#
-# Use this to control the poll time.
-# the default is 60 or 1 minute
-NETTIME 30