diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile
index 12f206a2c7ed..516e5ff69a7e 100644
--- a/java/jakarta-commons-discovery/Makefile
+++ b/java/jakarta-commons-discovery/Makefile
@@ -6,37 +6,33 @@
 #
 
 PORTNAME=	commons-discovery
-PORTVERSION=	0.2
+PORTVERSION=	0.4
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries
 PKGNAMEPREFIX=	jakarta-
 
-MAINTAINER=	hq@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Java library for locating resources (including classes)
 
 USE_JAVA=	YES
 JAVA_VERSION=	1.3+
-JAVA_RUN=	JDK
 NO_BUILD=	YES
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	api LICENSE
+PORTDOCS=	*
 .endif
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES+=	%%JAVAJARDIR%%/${JARFILE}
 
-post-extract:
-	@${MV} ${WRKSRC}/LICENSE ${WRKSRC}/docs/
-
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
-	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${JARFILE}
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation..."
-	@cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
-	@cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	@cd ${WRKSRC}/docs && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
+	@cd ${WRKSRC}/docs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
diff --git a/java/jakarta-commons-discovery/distinfo b/java/jakarta-commons-discovery/distinfo
index dc91a20be235..20965694723d 100644
--- a/java/jakarta-commons-discovery/distinfo
+++ b/java/jakarta-commons-discovery/distinfo
@@ -1,3 +1,3 @@
-MD5 (commons-discovery-0.2.tar.gz) = 2273f5f83a477f4f18fccf3a00e2b48c
-SHA256 (commons-discovery-0.2.tar.gz) = a2a06edafaeeecbdc708c687f26c8a76e7114df40a22141b3fb7542017dc0ecc
-SIZE (commons-discovery-0.2.tar.gz) = 118701
+MD5 (commons-discovery-0.4.tar.gz) = e612b7c2398eff2472dbd9f8739aca70
+SHA256 (commons-discovery-0.4.tar.gz) = 7546de497e88c6fa7b7f933c1b14b54e3e2977d09ed1ffdd890cf27f0fa14889
+SIZE (commons-discovery-0.4.tar.gz) = 292757