diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 7781f62a60a7..c173b3173706 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	jwhois
 PORTVERSION=	4.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	GNU \
 		https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/j/:srpm
 DISTFILES=	${DISTNAME}.tar.gz jwhois-4.0-73.fc38.src.rpm:srpm
 
 MAINTAINER=	terry-freebsd@glaver.org
 COMMENT=	Improved WHOIS client capable of selecting server to query
 WWW=		https://www.gnu.org/software/jwhois/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	lynx:www/lynx
 LIB_DEPENDS=	libidn.so:dns/libidn
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		gettext gmake iconv
 CPPFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/var/jwhois
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_OFF=	--disable-nls \
 			--without-libiconv-prefix
 
 INSTALL_TARGET=	install-strip
 
 INFO=		jwhois
 
 .include <bsd.port.pre.mk>
 
 JWHOIS_CONF_SRC=	${WRKDIR}/jwhois.conf
 
 pre-patch:
 .for p in jwhois-4.0-connect.patch jwhois-4.0-ipv6match.patch jwhois-4.0-fclose.patch \
 		jwhois-4.0-select.patch jwhois-4.0-multi-homed.patch jwhois-4.0-libidn2.patch \
 		jwhois-4.0-idna.patch jwhois-4.0-idnfail.patch jwhois-4.0-ipv4_ipv6.patch \
 		jwhois-configure-c99.patch jwhois-c99.patch
 	(cd ${WRKSRC} && ${PATCH} -p1 <  ${WRKDIR}/${p})
 .endfor
 
 post-patch:
 	${REINPLACE_CMD} 's|browser-pathname = "/usr/bin|browser-pathname = "${LOCALBASE}/bin|' \
 		${WRKDIR}/jwhois.conf
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/var/jwhois
 	${INSTALL_DATA} ${JWHOIS_CONF_SRC} ${STAGEDIR}${PREFIX}/etc/jwhois.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/net/jwhois/pkg-plist b/net/jwhois/pkg-plist
index cc0fdb6dc702..d19f4af7dc63 100644
--- a/net/jwhois/pkg-plist
+++ b/net/jwhois/pkg-plist
@@ -1,22 +1,22 @@
 bin/jwhois
 @sample etc/jwhois.conf.sample
-man/man1/jwhois.1.gz
-man/sv/man1/jwhois.1.gz
+share/man/man1/jwhois.1.gz
+share/man/sv/man1/jwhois.1.gz
 %%NLS%%share/locale/es/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/id/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/it/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/jwhois.mo
 @rmtry var/jwhois/jwhois.db
 @dir(,nogroup,775) var/jwhois
 @dir var