diff --git a/java/jaxen/Makefile b/java/jaxen/Makefile
index a2c1b3102192..4f6aa283e810 100644
--- a/java/jaxen/Makefile
+++ b/java/jaxen/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	jaxen
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,28 +18,29 @@ COMMENT=	Java XPath Engine
 USE_JAVA=	1.3+
 NO_BUILD=	YES
 
-PORT_JARFILES=		jaxen-core.jar jaxen-dom.jar jaxen-dom4j.jar jaxen-exml.jar jaxen-full.jar jaxen-jdom.jar
-JAVA_WRKDOCSDIR=	${WRKSRC}/doc
-PLIST_FILES+=		${PORT_JARFILES:S,^,${JAVAJARDIR:S,^${PREFIX}/,,}/,}
+JARFILES=	jaxen-core.jar jaxen-dom.jar jaxen-dom4j.jar jaxen-exml.jar jaxen-full.jar jaxen-jdom.jar lib/saxpath.jar
+WRKDOCSDIR=	${WRKSRC}/doc
+PLIST_FILES+=	${JARFILES:S,^lib/,,:S,^,%%JAVAJARDIR%%/,}
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	LICENSE default.css download.html faq.html index.html javadoc status.html style
+DOCS=		default.css download.html faq.html index.html javadoc status.html style
+PORTDOCS=	LICENSE ${DOCS}
 .endif
 
 do-install:
-	@${ECHO} -n ">> Installing JAR files in ${JAVAJARDIR}..."
+	@${ECHO_MSG} -n ">> Installing JAR files in ${JAVAJARDIR}..."
 	@${MKDIR} ${JAVAJARDIR}
-.for JARFILE in ${PORT_JARFILES}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${JARFILE} ${JAVAJARDIR}
-	@${ECHO} -n " ${JARFILE}"
+.for JARFILE in ${JARFILES}
+	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}
+	@${ECHO_MSG} -n " ${JARFILE:S,^lib/,,}"
 .endfor
-	@${ECHO} " [DONE]"
+	@${ECHO_MSG} " [DONE]"
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
-	@cd ${JAVA_WRKDOCSDIR} && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} ";"
-	@cd ${JAVA_WRKDOCSDIR} && ${FIND} . -type f -exec ${INSTALL_MAN} ${JAVA_WRKDOCSDIR}/{} ${DOCSDIR}/{} ";"
-	@${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}/LICENSE
-	@${ECHO} " [DONE]"
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@cd ${WRKDOCSDIR} && ${FIND} ${DOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} ";"
+	@cd ${WRKDOCSDIR} && ${FIND} ${DOCS} -type f -exec ${INSTALL_DATA} ${WRKDOCSDIR}/{} ${DOCSDIR}/{} ";"
+	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/LICENSE
+	@${ECHO_MSG} " [DONE]"
 .endif
 
 .include <bsd.port.mk>