diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index 2946e8d18566..38876c6aace3 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -1,54 +1,57 @@
 PORTNAME=	maven
 DISTVERSION=	3.8.8
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
-DISTNAME=	apache-maven-${DISTVERSION}-bin
+DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-bin
 
 MAINTAINER=	michaelo@apache.org
 COMMENT=	Java project management tool
 WWW=		https://maven.apache.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USES=		cpe
 CPE_VENDOR=	apache
 CPE_PRODUCT=	maven
 USE_JAVA=	yes
 
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+DATADIR=	${JAVASHAREDIR}/${INSTANCE_ID}
 NO_ARCH=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
-INSTANCE_FILE=	${PORTNAME}-${PORTVERSION}
-INSTANCES_DIR=	etc/maven-wrapper/instances.d/
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-bin//}
+PLIST_SUB=	PORTVERSION=${PORTVERSION} \
+	INSTANCE_ID=${INSTANCE_ID} \
+	INSTANCES_DIR=${INSTANCES_DIR}
+INSTANCE_ID=	${DISTNAME:S/-bin//:R}
+INSTANCES_DIR=	${LOCALBASE}/etc/maven-wrapper/instances.d
 
 post-extract:
 	${RM} -r ${WRKSRC}/lib/jansi-native ${WRKSRC}/bin/*.cmd
-	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
+	${ECHO_CMD} "${DATADIR}" > ${WRKDIR}/${INSTANCE_ID}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '36,39d;54,72d;74,75d' \
 		-e 's|/usr/local|${LOCALBASE}|g' \
 		-E -e 's|^MAVEN_HOME=.+$$|MAVEN_HOME="${DATADIR}"|g' ${WRKSRC}/bin/mvn
 	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} \
 		${STAGEDIR}${DATADIR}/{} \;
 	cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" \
 		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
 	@cd ${STAGEDIR}${DATADIR} && ${FIND} conf -type f -exec ${CP} \
 		'{}' '{}'.sample \;
 	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${STAGEDIR}${DATADIR}/bin/m2.conf.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mvn ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mvnDebug ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mvnyjp ${STAGEDIR}${DATADIR}/bin
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
-	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \
-		${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
+	@${MKDIR} ${STAGEDIR}${INSTANCES_DIR}
+	${INSTALL_DATA} ${WRKDIR}/${INSTANCE_ID} \
+		${STAGEDIR}${INSTANCES_DIR}
 
 .include <bsd.port.mk>
diff --git a/devel/maven/pkg-plist b/devel/maven/pkg-plist
index 478dcab1dcd5..6bfdd1781c00 100644
--- a/devel/maven/pkg-plist
+++ b/devel/maven/pkg-plist
@@ -1,70 +1,69 @@
-%%ETCDIR%%-wrapper/instances.d/maven-%%PORTVERSION%%
+%%INSTANCES_DIR%%/%%INSTANCE_ID%%
 %%DATADIR%%/LICENSE
 %%DATADIR%%/NOTICE
 %%DATADIR%%/README.txt
 @sample %%DATADIR%%/bin/m2.conf.sample
 %%DATADIR%%/bin/mvn
 %%DATADIR%%/bin/mvnDebug
 %%DATADIR%%/bin/mvnyjp
 %%DATADIR%%/boot/plexus-classworlds-2.6.0.jar
 %%DATADIR%%/boot/plexus-classworlds.license
 @sample %%DATADIR%%/conf/logging/simplelogger.properties.sample
 @sample %%DATADIR%%/conf/settings.xml.sample
 @sample %%DATADIR%%/conf/toolchains.xml.sample
 %%DATADIR%%/lib/commons-cli-1.4.jar
 %%DATADIR%%/lib/commons-cli.license
 %%DATADIR%%/lib/commons-lang3-3.8.1.jar
 %%DATADIR%%/lib/commons-lang3.license
 %%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.36.jar
 %%DATADIR%%/lib/jcl-over-slf4j.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.1.jar
 %%DATADIR%%/lib/plexus-utils.license
 %%DATADIR%%/lib/slf4j-api-1.7.36.jar
 %%DATADIR%%/lib/slf4j-api.license
 %%DATADIR%%/lib/wagon-file-3.5.3.jar
 %%DATADIR%%/lib/wagon-http-3.5.3-shaded.jar
 %%DATADIR%%/lib/wagon-provider-api-3.5.3.jar
 %%DATADIR%%/lib/ext/README.txt
-%%DATADIR%%/maven-%%PORTVERSION%%