diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 7dfd772b6907..be421792cfaf 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xymon
 PORTVERSION=	4.3.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
@@ -36,7 +36,7 @@ MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
 MAKE_ENV+=	XYMONHOSTNAME="${XYMONHOSTNAME}"
 MAKE_ENV+=	XYMONHOSTIP="${XYMONHOSTIP}"
 MAKE_ENV+=	INSTALLROOT="${STAGEDIR}"
-MANPREFIX=	${STAGEDIR}${PREFIX}
+MAKE_ENV+=	MANPREFIX="${STAGEDIR}${PREFIX}/share"
 MAKE_ARGS+=	PKGBUILD="true"
 USE_RC_SUBR=	xymon-server
 SUB_LIST+=	XYMONUSER="${XYMONUSER}"
diff --git a/net-mgmt/xymon-server/files/Makefile b/net-mgmt/xymon-server/files/Makefile
index 1b1bd87aedb7..5593d9056584 100644
--- a/net-mgmt/xymon-server/files/Makefile
+++ b/net-mgmt/xymon-server/files/Makefile
@@ -17,7 +17,7 @@ SECURECGIDIR = ${PREFIX}/www/xymon/cgi-secure
 # Where to put logfiles
 XYMONLOGDIR = /var/log/xymon
 # Where to install manpages
-MANROOT = ${PREFIX}/man
+MANROOT = ${PREFIX}/share/man
 # How to run fping or xymonping
 FPING = fping
 
diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist
index 694b96ad52ed..b1404a041fc5 100644
--- a/net-mgmt/xymon-server/pkg-plist
+++ b/net-mgmt/xymon-server/pkg-plist
@@ -1,71 +1,71 @@
-man/man1/ackinfo.cgi.1
-man/man1/acknowledge.cgi.1
-man/man1/appfeed.cgi.1
-man/man1/clientupdate.1
-man/man1/combostatus.1
-man/man1/confreport.cgi.1
-man/man1/criticaleditor.cgi.1
-man/man1/criticalview.cgi.1
-man/man1/csvinfo.cgi.1
-man/man1/datepage.cgi.1
-man/man1/eventlog.cgi.1
-man/man1/findhost.cgi.1
-man/man1/ghostlist.cgi.1
-man/man1/history.cgi.1
-man/man1/hostgraphs.cgi.1
-man/man1/logfetch.1
-man/man1/orcaxymon.1
-man/man1/report.cgi.1
-man/man1/reportlog.cgi.1
-man/man1/showgraph.cgi.1
-man/man1/snapshot.cgi.1
-man/man1/statusreport.cgi.1
-man/man1/svcstatus.cgi.1
-man/man1/xymon.1
-man/man1/xymoncfg.1
-man/man1/xymoncmd.1
-man/man1/xymondigest.1
-man/man1/xymongen.1
-man/man1/xymongrep.1
-man/man1/xymonnet-again.sh.1
-man/man1/xymonnet.1
-man/man1/xymonpage.cgi.1
-man/man5/alerts.cfg.5
-man/man5/analysis.cfg.5
-man/man5/cgioptions.cfg.5
-man/man5/client-local.cfg.5
-man/man5/clientlaunch.cfg.5
-man/man5/combo.cfg.5
-man/man5/critical.cfg.5
-man/man5/graphs.cfg.5
-man/man5/hosts.cfg.5
-man/man5/protocols.cfg.5
-man/man5/tasks.cfg.5
-man/man5/xymon-xmh.5
-man/man5/xymonclient.cfg.5
-man/man5/xymonserver.cfg.5
-man/man5/xymonweb.5
-man/man5/xymonwebaccess.5
-man/man7/xymon.7
-man/man8/enadis.cgi.8
-man/man8/msgcache.8
-man/man8/trimhistory.8
-man/man8/xymon-mailack.8
-man/man8/xymoncgimsg.cgi.8
-man/man8/xymond.8
-man/man8/xymond_alert.8
-man/man8/xymond_capture.8
-man/man8/xymond_channel.8
-man/man8/xymond_client.8
-man/man8/xymond_distribute.8
-man/man8/xymond_filestore.8
-man/man8/xymond_history.8
-man/man8/xymond_hostdata.8
-man/man8/xymond_rrd.8
-man/man8/xymond_sample.8
-man/man8/xymonfetch.8
-man/man8/xymonlaunch.8
-man/man8/xymonproxy.8
+share/man/man1/ackinfo.cgi.1.gz
+share/man/man1/acknowledge.cgi.1.gz
+share/man/man1/appfeed.cgi.1.gz
+share/man/man1/clientupdate.1.gz
+share/man/man1/combostatus.1.gz
+share/man/man1/confreport.cgi.1.gz
+share/man/man1/criticaleditor.cgi.1.gz
+share/man/man1/criticalview.cgi.1.gz
+share/man/man1/csvinfo.cgi.1.gz
+share/man/man1/datepage.cgi.1.gz
+share/man/man1/eventlog.cgi.1.gz
+share/man/man1/findhost.cgi.1.gz
+share/man/man1/ghostlist.cgi.1.gz
+share/man/man1/history.cgi.1.gz
+share/man/man1/hostgraphs.cgi.1.gz
+share/man/man1/logfetch.1.gz
+share/man/man1/orcaxymon.1.gz
+share/man/man1/report.cgi.1.gz
+share/man/man1/reportlog.cgi.1.gz
+share/man/man1/showgraph.cgi.1.gz
+share/man/man1/snapshot.cgi.1.gz
+share/man/man1/statusreport.cgi.1.gz
+share/man/man1/svcstatus.cgi.1.gz
+share/man/man1/xymon.1.gz
+share/man/man1/xymoncfg.1.gz
+share/man/man1/xymoncmd.1.gz
+share/man/man1/xymondigest.1.gz
+share/man/man1/xymongen.1.gz
+share/man/man1/xymongrep.1.gz
+share/man/man1/xymonnet-again.sh.1.gz
+share/man/man1/xymonnet.1.gz
+share/man/man1/xymonpage.cgi.1.gz
+share/man/man5/alerts.cfg.5.gz
+share/man/man5/analysis.cfg.5.gz
+share/man/man5/cgioptions.cfg.5.gz
+share/man/man5/client-local.cfg.5.gz
+share/man/man5/clientlaunch.cfg.5.gz
+share/man/man5/combo.cfg.5.gz
+share/man/man5/critical.cfg.5.gz
+share/man/man5/graphs.cfg.5.gz
+share/man/man5/hosts.cfg.5.gz
+share/man/man5/protocols.cfg.5.gz
+share/man/man5/tasks.cfg.5.gz
+share/man/man5/xymon-xmh.5.gz
+share/man/man5/xymonclient.cfg.5.gz
+share/man/man5/xymonserver.cfg.5.gz
+share/man/man5/xymonweb.5.gz
+share/man/man5/xymonwebaccess.5.gz
+share/man/man7/xymon.7.gz
+share/man/man8/enadis.cgi.8.gz
+share/man/man8/msgcache.8.gz
+share/man/man8/trimhistory.8.gz
+share/man/man8/xymon-mailack.8.gz
+share/man/man8/xymoncgimsg.cgi.8.gz
+share/man/man8/xymond.8.gz
+share/man/man8/xymond_alert.8.gz
+share/man/man8/xymond_capture.8.gz
+share/man/man8/xymond_channel.8.gz
+share/man/man8/xymond_client.8.gz
+share/man/man8/xymond_distribute.8.gz
+share/man/man8/xymond_filestore.8.gz
+share/man/man8/xymond_history.8.gz
+share/man/man8/xymond_hostdata.8.gz
+share/man/man8/xymond_rrd.8.gz
+share/man/man8/xymond_sample.8.gz
+share/man/man8/xymonfetch.8.gz
+share/man/man8/xymonlaunch.8.gz
+share/man/man8/xymonproxy.8.gz
 %%WWWDIR%%/cgi-bin/acknowledgements.sh
 %%WWWDIR%%/cgi-bin/appfeed-critical.sh
 %%WWWDIR%%/cgi-bin/appfeed.sh