diff --git a/sysutils/eclat/Makefile b/sysutils/eclat/Makefile
index ad983e395d4f..f3192bad7531 100644
--- a/sysutils/eclat/Makefile
+++ b/sysutils/eclat/Makefile
@@ -1,42 +1,44 @@
 PORTNAME=	eclat
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
 		http://download.gnu.org.ua/pub/alpha/${PORTNAME}/
 
 MAINTAINER=	zeus@gnu.org.ua
 COMMENT=	Amazon EC2 command line administration tool
 WWW=		https://puszcza.gnu.org.ua/software/eclat/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2
 
 USES=		gmake localbase tar:xz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 TEST_TARGET=	check
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README THANKS TODO
 
 OPTIONS_DEFINE=	DOCS GDBM LDAP
 OPTIONS_DEFAULT=	GDBM
 
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_WITH=	gdbm
 
 LDAP_USES=		ldap
 LDAP_CONFIGURE_WITH=	ldap
 
 post-patch:
 	@${REINPLACE_CMD} -e '/DESTDIR/s,eclat\.conf,&.sample,' \
 		${WRKSRC}/etc/Makefile.in
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/eclat/pkg-plist b/sysutils/eclat/pkg-plist
index 4e80abb978fc..5a652f7389af 100644
--- a/sysutils/eclat/pkg-plist
+++ b/sysutils/eclat/pkg-plist
@@ -1,54 +1,54 @@
 bin/eclat
 bin/ispeek
 @sample etc/eclat.conf.sample
-man/man1/eclat-addr2ec2.1.gz
-man/man1/eclat-addr2vpc.1.gz
-man/man1/eclat-assocaddr.1.gz
-man/man1/eclat-atvol.1.gz
-man/man1/eclat-chvol.1.gz
-man/man1/eclat-clrsattr.1.gz
-man/man1/eclat-cpimg.1.gz
-man/man1/eclat-cpsnap.1.gz
-man/man1/eclat-deimg.1.gz
-man/man1/eclat-devol.1.gz
-man/man1/eclat-disasaddr.1.gz
-man/man1/eclat-dmesg.1.gz
-man/man1/eclat-lsaattr.1.gz
-man/man1/eclat-lsaddr.1.gz
-man/man1/eclat-lschvol.1.gz
-man/man1/eclat-lsiattr.1.gz
-man/man1/eclat-lsimg.1.gz
-man/man1/eclat-lsinst.1.gz
-man/man1/eclat-lsistat.1.gz
-man/man1/eclat-lsreg.1.gz
-man/man1/eclat-lssattr.1.gz
-man/man1/eclat-lssg.1.gz
-man/man1/eclat-lssnap.1.gz
-man/man1/eclat-lstag.1.gz
-man/man1/eclat-lsvol.1.gz
-man/man1/eclat-lszon.1.gz
-man/man1/eclat-mkaddr.1.gz
-man/man1/eclat-mkimg.1.gz
-man/man1/eclat-mkinst.1.gz
-man/man1/eclat-mksg.1.gz
-man/man1/eclat-mksnap.1.gz
-man/man1/eclat-mktag.1.gz
-man/man1/eclat-mkvol.1.gz
-man/man1/eclat-mkvpc.1.gz
-man/man1/eclat-reboot.1.gz
-man/man1/eclat-rmaddr.1.gz
-man/man1/eclat-rmsg.1.gz
-man/man1/eclat-rmsnap.1.gz
-man/man1/eclat-rmtag.1.gz
-man/man1/eclat-setaattr.1.gz
-man/man1/eclat-setiattr.1.gz
-man/man1/eclat-setsattr.1.gz
-man/man1/eclat-sg.1.gz
-man/man1/eclat-start.1.gz
-man/man1/eclat-stop.1.gz
-man/man1/eclat-terminate.1.gz
-man/man1/eclat.1.gz
-man/man1/ispeek.1.gz
-man/man5/eclat.conf.5.gz
+share/man/man1/eclat-addr2ec2.1.gz
+share/man/man1/eclat-addr2vpc.1.gz
+share/man/man1/eclat-assocaddr.1.gz
+share/man/man1/eclat-atvol.1.gz
+share/man/man1/eclat-chvol.1.gz
+share/man/man1/eclat-clrsattr.1.gz
+share/man/man1/eclat-cpimg.1.gz
+share/man/man1/eclat-cpsnap.1.gz
+share/man/man1/eclat-deimg.1.gz
+share/man/man1/eclat-devol.1.gz
+share/man/man1/eclat-disasaddr.1.gz
+share/man/man1/eclat-dmesg.1.gz
+share/man/man1/eclat-lsaattr.1.gz
+share/man/man1/eclat-lsaddr.1.gz
+share/man/man1/eclat-lschvol.1.gz
+share/man/man1/eclat-lsiattr.1.gz
+share/man/man1/eclat-lsimg.1.gz
+share/man/man1/eclat-lsinst.1.gz
+share/man/man1/eclat-lsistat.1.gz
+share/man/man1/eclat-lsreg.1.gz
+share/man/man1/eclat-lssattr.1.gz
+share/man/man1/eclat-lssg.1.gz
+share/man/man1/eclat-lssnap.1.gz
+share/man/man1/eclat-lstag.1.gz
+share/man/man1/eclat-lsvol.1.gz
+share/man/man1/eclat-lszon.1.gz
+share/man/man1/eclat-mkaddr.1.gz
+share/man/man1/eclat-mkimg.1.gz
+share/man/man1/eclat-mkinst.1.gz
+share/man/man1/eclat-mksg.1.gz
+share/man/man1/eclat-mksnap.1.gz
+share/man/man1/eclat-mktag.1.gz
+share/man/man1/eclat-mkvol.1.gz
+share/man/man1/eclat-mkvpc.1.gz
+share/man/man1/eclat-reboot.1.gz
+share/man/man1/eclat-rmaddr.1.gz
+share/man/man1/eclat-rmsg.1.gz
+share/man/man1/eclat-rmsnap.1.gz
+share/man/man1/eclat-rmtag.1.gz
+share/man/man1/eclat-setaattr.1.gz
+share/man/man1/eclat-setiattr.1.gz
+share/man/man1/eclat-setsattr.1.gz
+share/man/man1/eclat-sg.1.gz
+share/man/man1/eclat-start.1.gz
+share/man/man1/eclat-stop.1.gz
+share/man/man1/eclat-terminate.1.gz
+share/man/man1/eclat.1.gz
+share/man/man1/ispeek.1.gz
+share/man/man5/eclat.conf.5.gz
 %%DATADIR%%/compl.sh
 %%DATADIR%%/eclat.forlan