diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index f72b4d84243ca..52b9056a67bd2 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -1,12 +1,12 @@
 # Created by: JonathanChen <jonc@chen.org.nz>
 
 PORTNAME=	maven
-DISTVERSION=	3.8.4
+DISTVERSION=	3.8.5
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
 
-MAINTAINER=	jonc@chen.org.nz
+MAINTAINER=	michaelo@apache.org
 COMMENT=	Java project management tool
 
 LICENSE=	APACHE20
@@ -14,16 +14,16 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USES=		cpe
+CPE_VENDOR=	apache
+CPE_PRODUCT=	maven
 USE_JAVA=	yes
 
-CPE_PRODUCT=	maven
-CPE_VENDOR=	apache
-NO_BUILD=	yes
-NO_ARCH=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
+NO_ARCH=	yes
+NO_BUILD=	yes
 SUB_FILES=	mvn.sh
 SUB_LIST=	CLASSWORLDS_JAR=plexus-classworlds-2.6.0.jar
+WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 INSTANCE_FILE=	${PORTNAME}-${PORTVERSION}
 INSTANCES_DIR=	etc/maven-wrapper/instances.d/
diff --git a/devel/maven/distinfo b/devel/maven/distinfo
index 14380d91d7274..4e8c9efd78463 100644
--- a/devel/maven/distinfo
+++ b/devel/maven/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638590505
-SHA256 (apache-maven-3.8.4-bin.tar.gz) = 2cdc9c519427bb20fdc25bef5a9063b790e4abd930e7b14b4e9f4863d6f9f13c
-SIZE (apache-maven-3.8.4-bin.tar.gz) = 9046177
+TIMESTAMP = 1647257304
+SHA256 (apache-maven-3.8.5-bin.tar.gz) = 88e30700f32a3f60e0d28d0f12a3525d29b7c20c72d130153df5b5d6d890c673
+SIZE (apache-maven-3.8.5-bin.tar.gz) = 8673123
diff --git a/devel/maven/pkg-plist b/devel/maven/pkg-plist
index d074b0a7b91c3..4ddbaf2e3af3c 100644
--- a/devel/maven/pkg-plist
+++ b/devel/maven/pkg-plist
@@ -30,7 +30,6 @@
 %%DATADIR%%/lib/javax.inject.license
 %%DATADIR%%/lib/jcl-over-slf4j-1.7.32.jar
 %%DATADIR%%/lib/jcl-over-slf4j.license
-%%DATADIR%%/lib/jsoup.license
 %%DATADIR%%/lib/maven-artifact-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-builder-support-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-compat-%%PORTVERSION%%.jar
@@ -67,7 +66,7 @@
 %%DATADIR%%/lib/plexus-utils.license
 %%DATADIR%%/lib/slf4j-api-1.7.32.jar
 %%DATADIR%%/lib/slf4j-api.license
-%%DATADIR%%/lib/wagon-file-3.4.3.jar
-%%DATADIR%%/lib/wagon-http-3.4.3-shaded.jar
-%%DATADIR%%/lib/wagon-provider-api-3.4.3.jar
+%%DATADIR%%/lib/wagon-file-3.5.1.jar
+%%DATADIR%%/lib/wagon-http-3.5.1-shaded.jar
+%%DATADIR%%/lib/wagon-provider-api-3.5.1.jar
 %%DATADIR%%/maven-%%PORTVERSION%%