diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index 78dbd29ad44a..27ea964afc01 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -1,90 +1,92 @@
 PORTNAME=	xmlto
 PORTVERSION=	0.0.28
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://releases.pagure.org/xmlto/:xmlto \
 		LOCAL/mandree/:xmlto \
 		http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/:xsl \
 		LOCAL/mandree/:xsl
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:xmlto \
 		xhtml2fo.xsl:xsl
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Front-end to an XSL toolchain
 WWW=		https://pagure.io/xmlto/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${BASH_CMD}:shells/bash \
 		${GETOPT_CMD}:misc/getopt \
 		xmllint:textproc/libxml2 \
 		xsltproc:textproc/libxslt \
 		docbook-xsl>0:textproc/docbook-xsl \
 		paperconf:print/libpaper \
 		w3m:www/w3m \
 		docbook-xml>0:textproc/docbook-xml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_GROUP=		BACKEND
 OPTIONS_GROUP_BACKEND=		DBLATEX FOP PASSIVETEX
 BACKEND_DESC=		Postprocessor backends to enable
 DBLATEX_DESC=		Add dependency on DBlatex (DB for DocBook)
 FOP_DESC=		Add dependency on FOP (requires Java)
 PASSIVETEX_DESC=	Add dependency on XMLTeX/PassiveTeX
 
 USES=		tar:bzip2
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	BASH=${BASH_CMD} GETOPT=${GETOPT_CMD} PDFXMLTEX=${PDFXMLTEX_CMD}
 MAKE_ENV+=	HOME=/dev/null
 
 BASH_CMD=	${LOCALBASE}/bin/bash
 GETOPT_CMD=	${LOCALBASE}/bin/getopt
 XSL_DIR=	${LOCALBASE}/share/xsl/docbook
 PDFXMLTEX_CMD=	${LOCALBASE}/bin/pdftex
 
 PORTDOCS=	AUTHORS ChangeLog NEWS THANKS
 # these documentation files do not convey information useful for
 # the FreeBSD port at this time, or are provided by the ports framework:
 # PORTDOCS+=	COPYING FAQ README
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MPASSIVETEX}
 USES+=		tex
 USE_TEX+=	xmltex
 .endif
 
 .if ${PORT_OPTIONS:MFOP}
 RUN_DEPENDS+=	fop>=0.90:textproc/fop
 CONFIGURE_ARGS+=	--with-backend=fop
 .endif
 
 .if ${PORT_OPTIONS:MDBLATEX}
 RUN_DEPENDS+=	${LOCALBASE}/bin/dblatex:textproc/dblatex
 .if ! ${PORT_OPTIONS:MFOP}
 CONFIGURE_ARGS+=	--with-backend=dblatex
 .endif
 .endif
 
 post-patch:
 	${SED} -i '' -e 's/type -t/which/;' \
 		${WRKSRC}/format/docbook/epub \
 		${WRKSRC}/format/docbook/txt \
 		${WRKSRC}/format/fo/dvi \
 		${WRKSRC}/format/fo/pdf \
 		${WRKSRC}/format/xhtml1/txt
 	${REINPLACE_CMD} -e '/^GEN_MANPAGE/{s/\$$</$$>/;}' ${WRKSRC}/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/xhtml2fo.xsl ${STAGEDIR}${DATADIR}/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/xmlto/pkg-plist b/textproc/xmlto/pkg-plist
index 023285a83cb6..de775f48965f 100644
--- a/textproc/xmlto/pkg-plist
+++ b/textproc/xmlto/pkg-plist
@@ -1,40 +1,40 @@
 bin/xmlif
 bin/xmlto
-man/man1/xmlif.1.gz
-man/man1/xmlto.1.gz
+share/man/man1/xmlif.1.gz
+share/man/man1/xmlto.1.gz
 %%DATADIR%%/format/docbook/awt
 %%DATADIR%%/format/docbook/dvi
 %%DATADIR%%/format/docbook/epub
 %%DATADIR%%/format/docbook/fo
 %%DATADIR%%/format/docbook/html
 %%DATADIR%%/format/docbook/html-nochunks
 %%DATADIR%%/format/docbook/htmlhelp
 %%DATADIR%%/format/docbook/javahelp
 %%DATADIR%%/format/docbook/man
 %%DATADIR%%/format/docbook/mif
 %%DATADIR%%/format/docbook/pcl
 %%DATADIR%%/format/docbook/pdf
 %%DATADIR%%/format/docbook/ps
 %%DATADIR%%/format/docbook/svg
 %%DATADIR%%/format/docbook/txt
 %%DATADIR%%/format/docbook/xhtml
 %%DATADIR%%/format/docbook/xhtml-nochunks
 %%DATADIR%%/format/fo/awt
 %%DATADIR%%/format/fo/dvi
 %%DATADIR%%/format/fo/mif
 %%DATADIR%%/format/fo/pcl
 %%DATADIR%%/format/fo/pdf
 %%DATADIR%%/format/fo/ps
 %%DATADIR%%/format/fo/svg
 %%DATADIR%%/format/fo/txt
 %%DATADIR%%/format/xhtml1/awt
 %%DATADIR%%/format/xhtml1/dvi
 %%DATADIR%%/format/xhtml1/fo
 %%DATADIR%%/format/xhtml1/mif
 %%DATADIR%%/format/xhtml1/pcl
 %%DATADIR%%/format/xhtml1/pdf
 %%DATADIR%%/format/xhtml1/ps
 %%DATADIR%%/format/xhtml1/svg
 %%DATADIR%%/format/xhtml1/txt
 %%DATADIR%%/xhtml2fo.xsl
 %%DATADIR%%/xmlto.mak