diff --git a/devel/maven-wrapper/Makefile b/devel/maven-wrapper/Makefile
index 2429a79b11db..d7505dce4dd2 100644
--- a/devel/maven-wrapper/Makefile
+++ b/devel/maven-wrapper/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	maven-wrapper
-PORTVERSION=	1
-PORTREVISION=	2
+PORTVERSION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	# none
 DISTFILES=	# none
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	michaelo@apache.org
 COMMENT=	Wrapper script for the various installations of Maven
 
 NO_BUILD=	yes
 SUB_FILES=	mvn.sh
-SUB_LIST=	CAT=${CAT} FIND=${FIND} TAIL=${TAIL}
+SUB_LIST=	ETCDIR=${ETCDIR} CAT=${CAT} FIND=${FIND} TAIL=${TAIL}
+PLIST_SUB=	ETCDIR=${ETCDIR}
 
 do-install:
-	${MKDIR} "${STAGEDIR}${PREFIX}/etc/maven-wrapper/instances.d"
+	${MKDIR} "${STAGEDIR}${ETCDIR}/instances.d"
 	${INSTALL_SCRIPT} "${WRKDIR}/mvn.sh" "${STAGEDIR}${PREFIX}/bin/mvn"
+	${INSTALL_SCRIPT} "${WRKDIR}/mvn.sh" "${STAGEDIR}${PREFIX}/bin/mvnDebug"
 
 .include <bsd.port.mk>