diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index a41d3b27ec9a..90112042189e 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,76 +1,77 @@
 PORTNAME=	apache-ant
 DISTVERSION=	1.10.13
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/ant/binaries:bin \
 		https://deb.debian.org/debian/pool/main/a/ant/:man
 DISTFILES=	${ANT_DISTFILE}:bin \
 		${MANPAGE_DISTFILE}:man
 EXTRACT_ONLY=	${ANT_DISTFILE}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java- and XML-based build tool, conceptually similar to make
 WWW=		https://ant.apache.org/
 
 LICENSE=	APACHE20
 
 USES=		cpe tar:bzip2
 CPE_VENDOR=	apache
 CPE_PRODUCT=	ant
 USE_JAVA=	yes
 
 ANT_DISTFILE=	${PORTNAME}-${DISTVERSION}-bin.tar.bz2
 MANPAGE_DISTFILE=	ant_${DISTVERSION}-${MANPAGE_VERSION}.debian.tar.xz
 MANPAGE_VERSION=	1
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 READMES=	LICENSE README WHATSNEW
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-manual.tar.bz2:doc
 MASTER_SITES+=	APACHE/ant/manual:doc
 PORTDOCS=	*
 .endif
 
 SUB_FILES=	ant.sh
 
 post-extract:
 	@${TAR} -C ${WRKSRC} -xJf ${DISTDIR}/${MANPAGE_DISTFILE} debian/ant.1 debian/build.xml.5
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing scripts..."
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/ant.sh ${STAGEDIR}${PREFIX}/bin/ant
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${STAGEDIR}${DATADIR}/bin/
 	@${ECHO_MSG} " [ DONE ]"
 
 .for d in etc lib
 	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 	@${ECHO_MSG} -n ">> Installing manpages..."
-	${INSTALL_MAN} ${WRKSRC}/debian/ant.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/debian/build.xml.5 ${STAGEDIR}${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/debian/ant.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/debian/build.xml.5 ${STAGEDIR}${PREFIX}/share/man/man5
 	@${ECHO_MSG} " [ DONE ]"
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 
 	@${ECHO_MSG} -n ">> Installing readme files..."
 	${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Installing documentation files..."
 	cd ${WRKSRC} && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/apache-ant/pkg-plist b/devel/apache-ant/pkg-plist
index 31c3e1f65518..f8c043f9bf82 100644
--- a/devel/apache-ant/pkg-plist
+++ b/devel/apache-ant/pkg-plist
@@ -1,75 +1,75 @@
 %%DATADIR%%/bin/antRun
 %%DATADIR%%/etc/ant-bootstrap.jar
 %%DATADIR%%/etc/changelog.xsl
 %%DATADIR%%/etc/checkstyle/checkstyle-frames-sortby-check.xsl
 %%DATADIR%%/etc/checkstyle/checkstyle-frames.xsl
 %%DATADIR%%/etc/checkstyle/checkstyle-text.xsl
 %%DATADIR%%/etc/checkstyle/checkstyle-xdoc.xsl
 %%DATADIR%%/etc/coverage-frames.xsl
 %%DATADIR%%/etc/jdepend-frames.xsl
 %%DATADIR%%/etc/jdepend.xsl
 %%DATADIR%%/etc/junit-frames-xalan1.xsl
 %%DATADIR%%/etc/junit-frames.xsl
 %%DATADIR%%/etc/junit-noframes.xsl
 %%DATADIR%%/etc/log.xsl
 %%DATADIR%%/etc/maudit-frames.xsl
 %%DATADIR%%/etc/mmetrics-frames.xsl
 %%DATADIR%%/etc/tagdiff.xsl
 %%DATADIR%%/lib/README
 %%DATADIR%%/lib/ant-antlr.jar
 %%DATADIR%%/lib/ant-antlr.pom
 %%DATADIR%%/lib/ant-apache-bcel.jar
 %%DATADIR%%/lib/ant-apache-bcel.pom
 %%DATADIR%%/lib/ant-apache-bsf.jar
 %%DATADIR%%/lib/ant-apache-bsf.pom
 %%DATADIR%%/lib/ant-apache-log4j.jar
 %%DATADIR%%/lib/ant-apache-log4j.pom
 %%DATADIR%%/lib/ant-apache-oro.jar
 %%DATADIR%%/lib/ant-apache-oro.pom
 %%DATADIR%%/lib/ant-apache-regexp.jar
 %%DATADIR%%/lib/ant-apache-regexp.pom
 %%DATADIR%%/lib/ant-apache-resolver.jar
 %%DATADIR%%/lib/ant-apache-resolver.pom
 %%DATADIR%%/lib/ant-apache-xalan2.jar
 %%DATADIR%%/lib/ant-apache-xalan2.pom
 %%DATADIR%%/lib/ant-commons-logging.jar
 %%DATADIR%%/lib/ant-commons-logging.pom
 %%DATADIR%%/lib/ant-commons-net.jar
 %%DATADIR%%/lib/ant-commons-net.pom
 %%DATADIR%%/lib/ant-imageio.jar
 %%DATADIR%%/lib/ant-imageio.pom
 %%DATADIR%%/lib/ant-jai.jar
 %%DATADIR%%/lib/ant-jai.pom
 %%DATADIR%%/lib/ant-jakartamail.jar
 %%DATADIR%%/lib/ant-jakartamail.pom
 %%DATADIR%%/lib/ant-javamail.jar
 %%DATADIR%%/lib/ant-javamail.pom
 %%DATADIR%%/lib/ant-jdepend.jar
 %%DATADIR%%/lib/ant-jdepend.pom
 %%DATADIR%%/lib/ant-jmf.jar
 %%DATADIR%%/lib/ant-jmf.pom
 %%DATADIR%%/lib/ant-jsch.jar
 %%DATADIR%%/lib/ant-jsch.pom
 %%DATADIR%%/lib/ant-junit.jar
 %%DATADIR%%/lib/ant-junit.pom
 %%DATADIR%%/lib/ant-junit4.jar
 %%DATADIR%%/lib/ant-junit4.pom
 %%DATADIR%%/lib/ant-junitlauncher.jar
 %%DATADIR%%/lib/ant-junitlauncher.pom
 %%DATADIR%%/lib/ant-launcher.jar
 %%DATADIR%%/lib/ant-launcher.pom
 %%DATADIR%%/lib/ant-netrexx.jar
 %%DATADIR%%/lib/ant-netrexx.pom
 %%DATADIR%%/lib/ant-parent.pom
 %%DATADIR%%/lib/ant-swing.jar
 %%DATADIR%%/lib/ant-swing.pom
 %%DATADIR%%/lib/ant-testutil.jar
 %%DATADIR%%/lib/ant-testutil.pom
 %%DATADIR%%/lib/ant-xz.jar
 %%DATADIR%%/lib/ant-xz.pom
 %%DATADIR%%/lib/ant.jar
 %%DATADIR%%/lib/ant.pom
 %%DATADIR%%/lib/libraries.properties
 bin/ant
-man/man1/ant.1.gz
-man/man5/build.xml.5.gz
+share/man/man1/ant.1.gz
+share/man/man5/build.xml.5.gz