diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index f72b4d84243c..52b9056a67bd 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -1,46 +1,46 @@
 # 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
 
 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/
 
 post-extract:
 	${RM} -r ${WRKSRC}/lib/jansi-native ${WRKSRC}/bin/*.cmd
 	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
 
 do-install:
 	cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} \
 		${STAGEDIR}${DATADIR}/{} \;
 	cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" \
 		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
 	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/mvn.sh ${STAGEDIR}${DATADIR}/bin/mvn
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
 	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \
 		${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
 
 .include <bsd.port.mk>
diff --git a/devel/maven/distinfo b/devel/maven/distinfo
index 14380d91d727..4e8c9efd7846 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 d074b0a7b91c..4ddbaf2e3af3 100644
--- a/devel/maven/pkg-plist
+++ b/devel/maven/pkg-plist
@@ -1,73 +1,72 @@
 %%ETCDIR%%-wrapper/instances.d/maven-%%PORTVERSION%%
 %%DATADIR%%/LICENSE
 %%DATADIR%%/NOTICE
 %%DATADIR%%/README.txt
 %%DATADIR%%/bin/m2.conf
 %%DATADIR%%/bin/mvn
 %%DATADIR%%/bin/mvnDebug
 %%DATADIR%%/bin/mvnyjp
 %%DATADIR%%/boot/plexus-classworlds-2.6.0.jar
 %%DATADIR%%/boot/plexus-classworlds.license
 %%DATADIR%%/conf/logging/simplelogger.properties
 %%DATADIR%%/conf/settings.xml
 %%DATADIR%%/conf/toolchains.xml
 %%DATADIR%%/lib/commons-cli-1.4.jar
 %%DATADIR%%/lib/commons-cli.license
 %%DATADIR%%/lib/commons-io-2.6.jar
 %%DATADIR%%/lib/commons-io.license
 %%DATADIR%%/lib/commons-lang3-3.8.1.jar
 %%DATADIR%%/lib/commons-lang3.license
 %%DATADIR%%/lib/ext/README.txt
 %%DATADIR%%/lib/guava-25.1-android.jar
 %%DATADIR%%/lib/guava.license
 %%DATADIR%%/lib/guice-4.2.2-no_aop.jar
 %%DATADIR%%/lib/guice.license
 %%DATADIR%%/lib/jansi-2.4.0.jar
 %%DATADIR%%/lib/jansi.license
 %%DATADIR%%/lib/javax.annotation-api-1.2.jar
 %%DATADIR%%/lib/javax.annotation-api.license
 %%DATADIR%%/lib/javax.inject-1.jar
 %%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
 %%DATADIR%%/lib/maven-core-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-embedder-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-model-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-model-builder-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-plugin-api-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-repository-metadata-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-resolver-api-1.6.3.jar
 %%DATADIR%%/lib/maven-resolver-connector-basic-1.6.3.jar
 %%DATADIR%%/lib/maven-resolver-impl-1.6.3.jar
 %%DATADIR%%/lib/maven-resolver-provider-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-resolver-spi-1.6.3.jar
 %%DATADIR%%/lib/maven-resolver-transport-wagon-1.6.3.jar
 %%DATADIR%%/lib/maven-resolver-util-1.6.3.jar
 %%DATADIR%%/lib/maven-settings-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-settings-builder-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-shared-utils-3.3.4.jar
 %%DATADIR%%/lib/maven-slf4j-provider-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/org.eclipse.sisu.inject-0.3.5.jar
 %%DATADIR%%/lib/org.eclipse.sisu.inject.license
 %%DATADIR%%/lib/org.eclipse.sisu.plexus-0.3.5.jar
 %%DATADIR%%/lib/org.eclipse.sisu.plexus.license
 %%DATADIR%%/lib/plexus-cipher-2.0.jar
 %%DATADIR%%/lib/plexus-cipher.license
 %%DATADIR%%/lib/plexus-component-annotations-2.1.0.jar
 %%DATADIR%%/lib/plexus-component-annotations.license
 %%DATADIR%%/lib/plexus-interpolation-1.26.jar
 %%DATADIR%%/lib/plexus-interpolation.license
 %%DATADIR%%/lib/plexus-sec-dispatcher-2.0.jar
 %%DATADIR%%/lib/plexus-sec-dispatcher.license
 %%DATADIR%%/lib/plexus-utils-3.3.0.jar
 %%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%%