diff --git a/textproc/html-xml-utils/Makefile b/textproc/html-xml-utils/Makefile
index debd31953ae6..389085ddcde6 100644
--- a/textproc/html-xml-utils/Makefile
+++ b/textproc/html-xml-utils/Makefile
@@ -1,33 +1,35 @@
PORTNAME= html-xml-utils
PORTVERSION= 8.6
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= https://www.w3.org/Tools/HTML-XML-utils/
MAINTAINER= takefu@airport.fm
COMMENT= Utilities for manipulating HTML and XML files
WWW= https://www.w3.org/Status.html#HTML-XML-utils
LICENSE= W3C
LICENSE_GROUPS= FSF GPL OSI
LICENSE_NAME= W3C Software Notice and License (2002-12-31)
LICENSE_FILE= ${WRKSRC}/COPYING
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= gmake iconv localbase shebangfix
SHEBANG_FILES= ${WRKSRC}/hxcite-mkbib
GNU_CONFIGURE= yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= LDFLAGS=${ICONV_LIB}
OPTIONS_DEFINE= CURL IDN IDN2 DOCS
OPTIONS_SUB= yes
IDN2_DESC= Use dns/libidn2 (IDNA2008 library)
CURL_LIB_DEPENDS= libcurl.so:ftp/curl
CURL_CONFIGURE_WITH= libcurl=${LOCALBASE}
IDN2_LIB_DEPENDS= libidn2.so:dns/libidn2
IDN2_CONFIGURE_WITH= libidn2=${LOCALBASE}
IDN_LIB_DEPENDS= libidn.so:dns/libidn
IDN_CONFIGURE_WITH= libidn=${LOCALBASE}
.include
diff --git a/textproc/html-xml-utils/pkg-plist b/textproc/html-xml-utils/pkg-plist
index 79bb3b60619f..b7aec7b5a15c 100644
--- a/textproc/html-xml-utils/pkg-plist
+++ b/textproc/html-xml-utils/pkg-plist
@@ -1,63 +1,63 @@
bin/asc2xml
bin/hxaddid
bin/hxcite
bin/hxcite-mkbib
bin/hxclean
bin/hxcopy
bin/hxcount
bin/hxextract
bin/hxincl
bin/hxindex
bin/hxmkbib
bin/hxmultitoc
bin/hxname2id
bin/hxnormalize
bin/hxnsxml
bin/hxnum
bin/hxpipe
bin/hxprintlinks
bin/hxprune
bin/hxref
bin/hxremove
bin/hxselect
bin/hxtabletrans
bin/hxtoc
bin/hxuncdata
bin/hxunent
bin/hxunpipe
bin/hxunxmlns
bin/hxwls
bin/hxxmlns
bin/xml2asc
-man/man1/asc2xml.1.gz
-man/man1/hxaddid.1.gz
-man/man1/hxcite-mkbib.1.gz
-man/man1/hxcite.1.gz
-man/man1/hxclean.1.gz
-man/man1/hxcopy.1.gz
-man/man1/hxcount.1.gz
-man/man1/hxextract.1.gz
-man/man1/hxincl.1.gz
-man/man1/hxindex.1.gz
-man/man1/hxmkbib.1.gz
-man/man1/hxmultitoc.1.gz
-man/man1/hxname2id.1.gz
-man/man1/hxnormalize.1.gz
-man/man1/hxnsxml.1.gz
-man/man1/hxnum.1.gz
-man/man1/hxpipe.1.gz
-man/man1/hxprintlinks.1.gz
-man/man1/hxprune.1.gz
-man/man1/hxref.1.gz
-man/man1/hxremove.1.gz
-man/man1/hxselect.1.gz
-man/man1/hxtabletrans.1.gz
-man/man1/hxtoc.1.gz
-man/man1/hxuncdata.1.gz
-man/man1/hxunent.1.gz
-man/man1/hxunpipe.1.gz
-man/man1/hxunxmlns.1.gz
-man/man1/hxwls.1.gz
-man/man1/hxxmlns.1.gz
-man/man1/xml2asc.1.gz
+share/man/man1/asc2xml.1.gz
+share/man/man1/hxaddid.1.gz
+share/man/man1/hxcite-mkbib.1.gz
+share/man/man1/hxcite.1.gz
+share/man/man1/hxclean.1.gz
+share/man/man1/hxcopy.1.gz
+share/man/man1/hxcount.1.gz
+share/man/man1/hxextract.1.gz
+share/man/man1/hxincl.1.gz
+share/man/man1/hxindex.1.gz
+share/man/man1/hxmkbib.1.gz
+share/man/man1/hxmultitoc.1.gz
+share/man/man1/hxname2id.1.gz
+share/man/man1/hxnormalize.1.gz
+share/man/man1/hxnsxml.1.gz
+share/man/man1/hxnum.1.gz
+share/man/man1/hxpipe.1.gz
+share/man/man1/hxprintlinks.1.gz
+share/man/man1/hxprune.1.gz
+share/man/man1/hxref.1.gz
+share/man/man1/hxremove.1.gz
+share/man/man1/hxselect.1.gz
+share/man/man1/hxtabletrans.1.gz
+share/man/man1/hxtoc.1.gz
+share/man/man1/hxuncdata.1.gz
+share/man/man1/hxunent.1.gz
+share/man/man1/hxunpipe.1.gz
+share/man/man1/hxunxmlns.1.gz
+share/man/man1/hxwls.1.gz
+share/man/man1/hxxmlns.1.gz
+share/man/man1/xml2asc.1.gz
%%PORTDOCS%%%%DOCSDIR%%/COPYING