diff --git a/sysutils/xorriso/Makefile b/sysutils/xorriso/Makefile
index 5d31dbe93880..55e91d5084c6 100644
--- a/sysutils/xorriso/Makefile
+++ b/sysutils/xorriso/Makefile
@@ -1,59 +1,61 @@
 PORTNAME=	xorriso
-PORTVERSION=	1.5.6
+DISTVERSION=	1.5.6
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://files.libburnia-project.org/releases/
 DISTNAME=	libisoburn-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ISO image manipulation tool based on Libburnia
 WWW=		https://dev.lovelyhq.com/libburnia/web/wiki
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libburn.so:devel/libburn \
 		libisofs.so:devel/libisofs
 
 USES=		gmake iconv libedit libtool pathfix pkgconfig readline \
 		shebangfix
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	frontend/xorriso-tcltk
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 INFO=		xorrecord xorriso xorrisofs
 
 PORTDOCS=	*.wiki
 
 OPTIONS_DEFINE=		CDIO DEBUG DOCS LIBACL LIBJTE READLINE TK XATTR ZLIB
 OPTIONS_DEFAULT=	LIBACL LIBJTE READLINE XATTR ZLIB
 OPTIONS_SUB=		yes
 
 LIBACL_DESC=	ACL Support
 LIBJTE_DESC=	Jigdo Support
 XATTR_DESC=	Extended file attribute Support
 
 CDIO_LIB_DEPENDS=		libcdio.so:sysutils/libcdio
 CDIO_CONFIGURE_ENABLE=		libcdio
 DEBUG_CONFIGURE_ENABLE=		debug
 LIBACL_CONFIGURE_ENABLE=	libacl
 LIBJTE_CONFIGURE_ENABLE=	libjte
 READLINE_CONFIGURE_ENABLE=	libreadline
 TK_USES=			tk
 TK_INFO=			xorriso-tcltk
 XATTR_CONFIGURE_ENABLE=		xattr
 ZLIB_CONFIGURE_ENABLE=		zlib
 
 post-patch:
 	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-TK-off:
 	${RM} ${STAGEDIR}${PREFIX}/bin/xorriso-tcltk \
 		${STAGEDIR}${PREFIX}/man/man1/xorriso-tcltk.1.gz \
 		${STAGEDIR}${PREFIX}/share/info/xorriso-tcltk.info
 
 .include <bsd.port.mk>
diff --git a/sysutils/xorriso/pkg-plist b/sysutils/xorriso/pkg-plist
index 8ff8ec606628..5cdd26ff8e0a 100644
--- a/sysutils/xorriso/pkg-plist
+++ b/sysutils/xorriso/pkg-plist
@@ -1,17 +1,17 @@
 bin/osirrox
 bin/xorrecord
 bin/xorriso
 %%TK%%bin/xorriso-tcltk
 bin/xorrisofs
 include/libisoburn/libisoburn.h
 include/libisoburn/xorriso.h
 lib/libisoburn.a
 lib/libisoburn.so
 lib/libisoburn.so.1
 lib/libisoburn.so.1.113.0
 libdata/pkgconfig/libisoburn-1.pc
-man/man1/xorrecord.1.gz
-%%TK%%man/man1/xorriso-tcltk.1.gz
-man/man1/xorriso.1.gz
-man/man1/xorrisofs.1.gz
+share/man/man1/xorrecord.1.gz
+%%TK%%share/man/man1/xorriso-tcltk.1.gz
+share/man/man1/xorriso.1.gz
+share/man/man1/xorrisofs.1.gz
 share/info/xorriso-dd-target.info