diff --git a/devel/shtool/Makefile b/devel/shtool/Makefile
index 019ec4b085c2..029c794b5d11 100644
--- a/devel/shtool/Makefile
+++ b/devel/shtool/Makefile
@@ -1,19 +1,21 @@
 PORTNAME=	shtool
 PORTVERSION=	2.0.8
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU OSSP/tool/${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	The GNU Portable Shell Tool
 WWW=		https://www.gnu.org/software/shtool/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		perl5
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 TEST_TARGET=	test
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/shtool/pkg-plist b/devel/shtool/pkg-plist
index a26be05a2ff5..32fe2aa04b9c 100644
--- a/devel/shtool/pkg-plist
+++ b/devel/shtool/pkg-plist
@@ -1,44 +1,44 @@
 bin/shtool
 bin/shtoolize
-man/man1/shtool-arx.1.gz
-man/man1/shtool-echo.1.gz
-man/man1/shtool-fixperm.1.gz
-man/man1/shtool-install.1.gz
-man/man1/shtool-mdate.1.gz
-man/man1/shtool-mkdir.1.gz
-man/man1/shtool-mkln.1.gz
-man/man1/shtool-mkshadow.1.gz
-man/man1/shtool-move.1.gz
-man/man1/shtool-path.1.gz
-man/man1/shtool-platform.1.gz
-man/man1/shtool-prop.1.gz
-man/man1/shtool-rotate.1.gz
-man/man1/shtool-scpp.1.gz
-man/man1/shtool-slo.1.gz
-man/man1/shtool-subst.1.gz
-man/man1/shtool-table.1.gz
-man/man1/shtool-tarball.1.gz
-man/man1/shtool-version.1.gz
-man/man1/shtool.1.gz
-man/man1/shtoolize.1.gz
 share/aclocal/shtool.m4
+share/man/man1/shtool-arx.1.gz
+share/man/man1/shtool-echo.1.gz
+share/man/man1/shtool-fixperm.1.gz
+share/man/man1/shtool-install.1.gz
+share/man/man1/shtool-mdate.1.gz
+share/man/man1/shtool-mkdir.1.gz
+share/man/man1/shtool-mkln.1.gz
+share/man/man1/shtool-mkshadow.1.gz
+share/man/man1/shtool-move.1.gz
+share/man/man1/shtool-path.1.gz
+share/man/man1/shtool-platform.1.gz
+share/man/man1/shtool-prop.1.gz
+share/man/man1/shtool-rotate.1.gz
+share/man/man1/shtool-scpp.1.gz
+share/man/man1/shtool-slo.1.gz
+share/man/man1/shtool-subst.1.gz
+share/man/man1/shtool-table.1.gz
+share/man/man1/shtool-tarball.1.gz
+share/man/man1/shtool-version.1.gz
+share/man/man1/shtool.1.gz
+share/man/man1/shtoolize.1.gz
 %%DATADIR%%/sh.arx
 %%DATADIR%%/sh.common
 %%DATADIR%%/sh.echo
 %%DATADIR%%/sh.fixperm
 %%DATADIR%%/sh.install
 %%DATADIR%%/sh.mdate
 %%DATADIR%%/sh.mkdir
 %%DATADIR%%/sh.mkln
 %%DATADIR%%/sh.mkshadow
 %%DATADIR%%/sh.move
 %%DATADIR%%/sh.path
 %%DATADIR%%/sh.platform
 %%DATADIR%%/sh.prop
 %%DATADIR%%/sh.rotate
 %%DATADIR%%/sh.scpp
 %%DATADIR%%/sh.slo
 %%DATADIR%%/sh.subst
 %%DATADIR%%/sh.table
 %%DATADIR%%/sh.tarball
 %%DATADIR%%/sh.version