diff --git a/security/rhash/Makefile b/security/rhash/Makefile
index 0954d4f3963c..796bd8f2a7ad 100644
--- a/security/rhash/Makefile
+++ b/security/rhash/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	rhash
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 PATCH_SITES=	https://github.com/rhash/RHash/commit/
 PATCHFILES+=	c804982d1b24c6533118b3068d2cfdca685076f3.patch:-p1
 PATCHFILES+=	9ef90b958b7ae50aeeb5c269468034d73d6e2efe.patch:-p1
 PATCHFILES+=	b8c91ea6551e99e10352386cd46ea26973bb4a4d.patch:-p1
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Utility and library for computing and checking of file hashes
 WWW=		https://rhash.sourceforge.net/
 
 LICENSE=	BSD0CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix="${PREFIX}" --mandir="${PREFIX}/man" \
+CONFIGURE_ARGS=	--prefix="${PREFIX}" --mandir="${PREFIX}/share/man" \
 		--pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 		--enable-lib-static --enable-openssl-runtime \
 		--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}"
 INSTALL_TARGET=	install install-lib-so-link install-pkg-config
 
 USES=		cpe
 CPE_VENDOR=	${PORTNAME}_project
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/RHash-${PORTVERSION}
 
 PORTDOCS=	ChangeLog README.md
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext localbase:ldflags
 NLS_CONFIGURE_ON=	--enable-gettext
 NLS_INSTALL_TARGET=	install-gmo
 
 post-patch:
 	@${REINPLACE_CMD} -e '/BYTE_ORDER/s,__,_,g' \
 		${WRKSRC}/librhash/byte_order.h
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	cd ${WRKSRC}/tests && ${SH} test_rhash.sh --full --shared
 
 .include <bsd.port.mk>
diff --git a/security/rhash/pkg-plist b/security/rhash/pkg-plist
index 0df03372730f..bae5e44582f9 100644
--- a/security/rhash/pkg-plist
+++ b/security/rhash/pkg-plist
@@ -1,42 +1,42 @@
 bin/ed2k-link
 bin/edonr256-hash
 bin/edonr512-hash
 bin/gost12-256-hash
 bin/gost12-512-hash
 bin/has160-hash
 bin/magnet-link
 bin/rhash
 bin/sfv-hash
 bin/tiger-hash
 bin/tth-hash
 bin/whirlpool-hash
 @sample etc/rhashrc.sample
 include/rhash.h
 include/rhash_torrent.h
 lib/librhash.a
 lib/librhash.so
 lib/librhash.so.1
 lib/librhash.so.1.4.4
 libdata/pkgconfig/librhash.pc
-man/man1/ed2k-link.1.gz
-man/man1/edonr256-hash.1.gz
-man/man1/edonr512-hash.1.gz
-man/man1/gost12-256-hash.1.gz
-man/man1/gost12-512-hash.1.gz
-man/man1/has160-hash.1.gz
-man/man1/magnet-link.1.gz
-man/man1/rhash.1.gz
-man/man1/sfv-hash.1.gz
-man/man1/tiger-hash.1.gz
-man/man1/tth-hash.1.gz
-man/man1/whirlpool-hash.1.gz
+share/man/man1/ed2k-link.1.gz
+share/man/man1/edonr256-hash.1.gz
+share/man/man1/edonr512-hash.1.gz
+share/man/man1/gost12-256-hash.1.gz
+share/man/man1/gost12-512-hash.1.gz
+share/man/man1/has160-hash.1.gz
+share/man/man1/magnet-link.1.gz
+share/man/man1/rhash.1.gz
+share/man/man1/sfv-hash.1.gz
+share/man/man1/tiger-hash.1.gz
+share/man/man1/tth-hash.1.gz
+share/man/man1/whirlpool-hash.1.gz
 %%NLS%%share/locale/ca/LC_MESSAGES/rhash.mo
 %%NLS%%share/locale/de/LC_MESSAGES/rhash.mo
 %%NLS%%share/locale/en_AU/LC_MESSAGES/rhash.mo
 %%NLS%%share/locale/es/LC_MESSAGES/rhash.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/rhash.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/rhash.mo
 %%NLS%%share/locale/it/LC_MESSAGES/rhash.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/rhash.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/rhash.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/rhash.mo