diff --git a/sysutils/hfsutils/Makefile b/sysutils/hfsutils/Makefile
index 0a60de4ae326..3ddb4126de36 100644
--- a/sysutils/hfsutils/Makefile
+++ b/sysutils/hfsutils/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	hfsutils
 PORTVERSION=	3.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.mars.org/pub/hfs/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for accessing Apple's HFS volumes
 WWW=		https://www.mars.org/home/rob/proj/hfs/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	hfs
 
 USES=		gmake			# passing -jX breaks BSD make(1)
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 ALL_TARGET=	all hfsck/hfsck
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	TCLTK DEVLIBS DOCS
 OPTIONS_SUB=	yes
 
 TCLTK_DESC=	Enable Tcl interface (HFS "shell") and Tk-based GUI
 DEVLIBS_DESC=	Install developer libraries and header files
 
 TCLTK_CATEGORIES=	tcl tk
 TCLTK_USES=		tk
 TCLTK_CPPFLAGS=		-I${LOCALBASE}/include
 TCLTK_CONFIGURE_ON=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}
 TCLTK_CONFIGURE_OFF=	--without-tcl --without-tk
 
 DEVLIBS_CONFIGURE_ON=	--enable-devlibs
 
 post-patch:
 # Unbreak against Tcl 8.6
 	@${ECHO_CMD} '#define USE_INTERP_RESULT 1' >> ${WRKSRC}/config.h.in
 # Allow staging (support DESTDIR)
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} \
 		${REINPLACE_CMD} -e '/^...DEST =/s,@,$$(DESTDIR)&,'
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hfsck/hfsck ${STAGEDIR}${PREFIX}/bin
 
 post-install-TCLTK-on:
 	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/hfs
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in BLURB CHANGES README TODO doc/*.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/hfsutils/pkg-plist b/sysutils/hfsutils/pkg-plist
index faaa5a43658f..287d168c53cd 100644
--- a/sysutils/hfsutils/pkg-plist
+++ b/sysutils/hfsutils/pkg-plist
@@ -1,40 +1,40 @@
 bin/hattrib
 bin/hcd
 bin/hcopy
 bin/hdel
 bin/hdir
 bin/hformat
 %%TCLTK%%bin/hfs
 bin/hfsck
 %%TCLTK%%bin/hfssh
 bin/hls
 bin/hmkdir
 bin/hmount
 bin/hpwd
 bin/hrename
 bin/hrmdir
 bin/humount
 bin/hvol
 %%TCLTK%%bin/xhfs
 %%DEVLIBS%%include/hfs.h
 %%DEVLIBS%%include/rsrc.h
 %%DEVLIBS%%lib/libhfs.a
 %%DEVLIBS%%lib/librsrc.a
-man/man1/hattrib.1.gz
-man/man1/hcd.1.gz
-man/man1/hcopy.1.gz
-man/man1/hdel.1.gz
-man/man1/hdir.1.gz
-man/man1/hformat.1.gz
-%%TCLTK%%man/man1/hfs.1.gz
-%%TCLTK%%man/man1/hfssh.1.gz
-man/man1/hfsutils.1.gz
-man/man1/hls.1.gz
-man/man1/hmkdir.1.gz
-man/man1/hmount.1.gz
-man/man1/hpwd.1.gz
-man/man1/hrename.1.gz
-man/man1/hrmdir.1.gz
-man/man1/humount.1.gz
-man/man1/hvol.1.gz
-%%TCLTK%%man/man1/xhfs.1.gz
+share/man/man1/hattrib.1.gz
+share/man/man1/hcd.1.gz
+share/man/man1/hcopy.1.gz
+share/man/man1/hdel.1.gz
+share/man/man1/hdir.1.gz
+share/man/man1/hformat.1.gz
+%%TCLTK%%share/man/man1/hfs.1.gz
+%%TCLTK%%share/man/man1/hfssh.1.gz
+share/man/man1/hfsutils.1.gz
+share/man/man1/hls.1.gz
+share/man/man1/hmkdir.1.gz
+share/man/man1/hmount.1.gz
+share/man/man1/hpwd.1.gz
+share/man/man1/hrename.1.gz
+share/man/man1/hrmdir.1.gz
+share/man/man1/humount.1.gz
+share/man/man1/hvol.1.gz
+%%TCLTK%%share/man/man1/xhfs.1.gz