diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index e17ce70a9171..eca8d7e1ba9d 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	sharutils
 PORTVERSION=	4.15.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	GNU
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Pack, send, and unpack shell archives; synchronize via e-mail
 WWW=		https://www.gnu.org/s/sharutils/
 
 LICENSE=	GPLv3
 
 USES=		charsetfix cpe perl5 tar:xz
 
 OPTIONS_DEFINE=	NLS
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g --disable-uucode
 INSTALL_TARGET=	install install-man
 INFO=		sharutils
 USE_PERL5=	build
 OPTIONS_SUB=	yes
 CPE_VENDOR=	gnu
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ON=	--with-libintl-prefix="${LOCALBASE}"
 NLS_CONFIGURE_OFF=	--disable-nls
 
 post-patch:
 	@${REINPLACE_CMD} -e '/Please include config.h first./ s,^.*$$,#include <config.h>,' \
 		${WRKSRC}/lib/unistd.in.h
 	@${REINPLACE_CMD} -e '/char const . const program_name/d' \
 		${WRKSRC}/src/shar-opts.h \
 		${WRKSRC}/src/shar-opts.c \
 		${WRKSRC}/src/unshar-opts.h \
 		${WRKSRC}/src/unshar-opts.c \
 		${WRKSRC}/src/uudecode-opts.h \
 		${WRKSRC}/src/uudecode-opts.c \
 		${WRKSRC}/src/uuencode-opts.h
 .for man in shar.1 unshar.1
 	@${REINPLACE_CMD} \
 		-e 's, SHAR , GSHAR ,' \
 		-e 's,Shar,Gshar,' \
 		-e 's, shar , gshar ,g' \
 		-e 's,^shar ,gshar ,' \
 		-e 's, UNSHAR , GUNSHAR ,' \
 		-e 's,Unshar,Gunshar,' \
 		-e 's,^unshar ,gunshar ,' \
 		-e 's,f2shar\\f1,f2gshar\\f1,' \
 		-e 's, unshar , gunshar ,g' \
 		-e 's,gshar file,shar file,g' \
 		-e 's,shar\,,gshar\,,' \
 		-e 's,shar(,gshar(,' \
 		-e 's,unshar(,gunshar(,' \
 		-e 's, shar\$$, gshar,' \
 		${WRKSRC}/doc/${man}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/archivers/sharutils/pkg-plist b/archivers/sharutils/pkg-plist
index e10510800b2e..67ca3915b4be 100644
--- a/archivers/sharutils/pkg-plist
+++ b/archivers/sharutils/pkg-plist
@@ -1,32 +1,32 @@
 bin/gshar
 bin/gunshar
-man/man1/gshar.1.gz
-man/man1/gunshar.1.gz
+share/man/man1/gshar.1.gz
+share/man/man1/gunshar.1.gz
 %%NLS%%share/locale/bg/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/da/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/de/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/el/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/es/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/et/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/id/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/it/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/sharutils.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/sharutils.mo