diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 9f3bb98bb22c..99af0bbba8db 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -1,112 +1,113 @@
 PORTNAME=	gnats
 PORTVERSION=	4.1.0
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	databases devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNATS, the GNU Problem Report Management System
 WWW=		https://www.gnu.org/software/gnats/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_mips=		Does not build: error: conflicting types for yy_scan_string
 BROKEN_mips64=		Does not build: error: conflicting types for yy_scan_string
 
 USES=		cpe gettext-runtime gmake
 CPE_VENDOR=	gnu
 USE_GCC=	yes
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=	--sharedstatedir=${GNATSDBDIR}
 
 .ifdef WANT_FREEFALL_CFG
 EXTRA_PATCHES+=		${PATCHDIR}/extrapatch-*
 GNATSDBDIR=		${DATADIR}
 CONFIGURE_ARGS+=	--with-gnats-default-db=${GNATSDBDIR}/gnats-db
 WITH_SUBMITTER_ID=	current-users
 WITH_ORGANIZATION=	FreeBSD
 WITH_GNATSD_SERVICE=	support
 .endif
 
 .ifdef WITH_SUBMITTER_ID
 CONFIGURE_ARGS+=	--with-submitter=${WITH_SUBMITTER_ID}
 .endif
 
 .ifdef WITH_ORGANIZATION
 CONFIGURE_ARGS+=	--with-organization=${WITH_ORGANIZATION:Q}
 .endif
 
 .ifdef WITH_GNATSD_SERVICE
 CONFIGURE_ARGS+=	--with-gnats-service=${WITH_GNATSD_SERVICE}
 .endif
 
 USERS=		gnats
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGMESSAGE=	${WRKDIR}/pkg-message
 INFO=		gnats-faq gnats
 PLIST_SUB=	GNATSDBDIR=${GNATSDBDIR}
 PORTDOCS=	NEWS UPGRADING
 
 OPTIONS_DEFINE=	DOCS EMACS SERVER
 OPTIONS_DEFAULT=SERVER
 OPTIONS_SUB=	yes
 
 EMACS_DESC=	Install Emacs Lisp support file
 SERVER_DESC=	Install the gnats server too
 
 EMACS_USES=	emacs
 EMACS_CONFIGURE_ON=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
 EMACS_PLIST_SUB_OFF=	EMACS_SITE_LISPDIR="@comment "
 EMACS_VARS=	EMACS_NO_DEPENDS=yes
 SERVER_ALL_TARGET_OFF=	all-tools
 SERVER_INSTALL_TARGET_OFF=	install-tools
 
 GNATSDBDIR?=		/var/db/gnats
 
 .include <bsd.port.options.mk>
 
 pre-everything::
 .if !defined(PACKAGE_BUILDING) && !defined(WANT_FREEFALL_CFG)
 	@${ECHO} "============================================================="
 	@${ECHO}
 	@${ECHO} "You can build ${PKGNAME} with the following options:"
 	@${ECHO}
 	@${ECHO} "WITH_SUBMITTER_ID=unknown        default submitter-id"
 	@${ECHO} "WITH_ORGANIZATION='unknown'      default organization"
 	@${ECHO} "WITH_GNATSD_SERVICE=support      default gnatsd port name"
 	@${ECHO}
 	@${ECHO} "============================================================="
 	@${ECHO}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|info man|man|g' ${WRKSRC}/doc/Makefile.in
 
 pre-configure:
 	@${ECHO_CMD} 'RELEASE_TAG="\`uname -srm\`"' > ${WRKSRC}/release-info
 
 post-build:
 	@for doc in pkg-message pkg-install; do \
 		${SED} -e 's,%%PREFIX%%,${STAGEDIR}${PREFIX},g' \
 			-e 's,%%GNATSDBDIR%%,${GNATSDBDIR},g' \
 			${PKGDIR}/$${doc} >${WRKDIR}/$${doc}; \
 	done
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gnats
 
 post-install-SERVER-on:
 	${MV} ${STAGEDIR}${ETCDIR}/databases.default \
 		${STAGEDIR}${ETCDIR}/databases.sample
 	${MV} ${STAGEDIR}${ETCDIR}/gnatsd.host_access.default \
 		${STAGEDIR}${ETCDIR}/gnatsd.host_access.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/databases/gnats4/pkg-plist b/databases/gnats4/pkg-plist
index abb3a12ee2fc..2f5cb3b6325c 100644
--- a/databases/gnats4/pkg-plist
+++ b/databases/gnats4/pkg-plist
@@ -1,52 +1,52 @@
 @(gnats,,4555) bin/edit-pr
 bin/getclose
 bin/install-sid
 bin/query-pr
 bin/send-pr
 %%SERVER%%@sample etc/gnats/databases.sample
 %%SERVER%%@sample etc/gnats/gnatsd.host_access.sample
 etc/gnats/defaults/addresses
 etc/gnats/defaults/categories
 etc/gnats/defaults/classes
 etc/gnats/defaults/dbconfig
 etc/gnats/defaults/gnatsd.user_access
 etc/gnats/defaults/responsible
 etc/gnats/defaults/states
 etc/gnats/defaults/submitters
 etc/gnats/send-pr.conf
 %%SERVER%%libexec/gnats/at-pr
 %%SERVER%%libexec/gnats/check-db
 %%SERVER%%libexec/gnats/delete-pr
 libexec/gnats/diff-prs
 libexec/gnats/file-pr
 @(gnats,,4555) %%SERVER%%libexec/gnats/gen-index
 @(gnats,,4555) %%SERVER%%libexec/gnats/gnatsd
 %%SERVER%%libexec/gnats/gnats-pwconv
 libexec/gnats/mail-agent
 %%SERVER%%libexec/gnats/mail-query
 %%SERVER%%libexec/gnats/mkcat
 %%SERVER%%libexec/gnats/mkdb
 libexec/gnats/pr-age
 libexec/gnats/pr-edit
 %%SERVER%%libexec/gnats/queue-pr
 %%SERVER%%libexec/gnats/rmcat
-man/man1/edit-pr.1.gz
-man/man1/query-pr.1.gz
-man/man1/send-pr.1.gz
-man/man5/databases.5.gz
-man/man5/dbconfig.5.gz
-man/man7/gnats.7.gz
-man/man8/delete-pr.8.gz
-man/man8/getclose.8.gz
-man/man8/file-pr.8.gz
-man/man8/gen-index.8.gz
-man/man8/gnatsd.8.gz
-man/man8/install-sid.8.gz
-man/man8/mkcat.8.gz
-man/man8/mkdb.8.gz
-man/man8/pr-edit.8.gz
-man/man8/queue-pr.8.gz
-man/man8/rmcat.8.gz
+share/man/man1/edit-pr.1.gz
+share/man/man1/query-pr.1.gz
+share/man/man1/send-pr.1.gz
+share/man/man5/databases.5.gz
+share/man/man5/dbconfig.5.gz
+share/man/man7/gnats.7.gz
+share/man/man8/delete-pr.8.gz
+share/man/man8/getclose.8.gz
+share/man/man8/file-pr.8.gz
+share/man/man8/gen-index.8.gz
+share/man/man8/gnatsd.8.gz
+share/man/man8/install-sid.8.gz
+share/man/man8/mkcat.8.gz
+share/man/man8/mkdb.8.gz
+share/man/man8/pr-edit.8.gz
+share/man/man8/queue-pr.8.gz
+share/man/man8/rmcat.8.gz
 %%EMACS_SITE_LISPDIR%%/gnats.el
 @dir(gnats,,) %%GNATSDBDIR%%/gnats
 @dir %%GNATSDBDIR%%