diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index a535326b108f8..d7da49121b4af 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	guacamole-server
 DISTVERSION=	1.5.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	APACHE/guacamole/${DISTVERSION}/source/
 
@@ -27,6 +28,7 @@ USE_RC_SUBR=	guacd
 SHEBANG_FILES=	${WRKSRC}/src/protocols/rdp/keymaps/generate.pl
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-guacd-conf=${ETCDIR}/guacd.conf
 INSTALL_TARGET=	install-strip
 CFLAGS+=	-Wno-error=newline-eof
diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist
index 7c95757c7ff5d..5cf72710b6266 100644
--- a/net/guacamole-server/pkg-plist
+++ b/net/guacamole-server/pkg-plist
@@ -77,9 +77,9 @@ lib/libguac-terminal.a
 lib/libguac-terminal.so
 lib/libguac-terminal.so.0
 lib/libguac-terminal.so.0.1.0
-%%GUACENC%%man/man1/guacenc.1.gz
-%%GUACLOG%%man/man1/guaclog.1.gz
-man/man5/guacd.conf.5.gz
-man/man8/guacd.8.gz
+%%GUACENC%%share/man/man1/guacenc.1.gz
+%%GUACLOG%%share/man/man1/guaclog.1.gz
+share/man/man5/guacd.conf.5.gz
+share/man/man8/guacd.8.gz
 sbin/guacd
 @dir(%%GUACD_USER%%,%%GUACD_GROUP%%,) %%GUACD_HOME%%