diff --git a/www/closure-compiler/Makefile b/www/closure-compiler/Makefile
index ed772bac25b9..d5eb650aa70a 100644
--- a/www/closure-compiler/Makefile
+++ b/www/closure-compiler/Makefile
@@ -1,29 +1,34 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 
 PORTNAME=	closure-compiler
-PORTVERSION=	20180805
+PORTVERSION=	20210808
+DISTVERSIONPREFIX=	v
 CATEGORIES=	www java
-MASTER_SITES=	http://dl.google.com/closure-compiler/
-DISTNAME=	compiler-${PORTVERSION}
+MASTER_SITES=	https://repo1.maven.org/maven2/com/google/javascript/${PORTNAME}/v${DISTVERSION}/
+EXTRACT_SUFX=	.jar
+EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bryan@frimin.fr
 COMMENT=	Closure Compiler
 
 LICENSE=	APACHE20
 
 NO_ARCH=	yes
 NO_BUILD=	yes
+USE_JAVA=	13
+
 NO_WRKSUBDIR=	yes
+
 SUB_FILES=	closure-compiler
-SUB_LIST=	JAVA="${JAVA}" PORTVERSION=${PORTVERSION}
-USE_JAVA=	yes
+SUB_LIST=	JAVA="${JAVA}" \
+		PORTVERSION=${PORTVERSION}
 
-PLIST_FILES=	bin/closure-compiler \
-		${DATADIR}/closure-compiler-v${PORTVERSION}.jar
+PLIST_FILES=	${DATADIR}/closure-compiler-v${PORTVERSION}.jar \
+		bin/closure-compiler
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/closure-compiler-v${PORTVERSION}.jar ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${DATADIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/closure-compiler ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/www/closure-compiler/distinfo b/www/closure-compiler/distinfo
index 9eb818602147..1359b028c5d6 100644
--- a/www/closure-compiler/distinfo
+++ b/www/closure-compiler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535945865
-SHA256 (compiler-20180805.tar.gz) = 46608ba116c6fe50968a31ea4e5e9a4b508410f232508dd435d8fab5a64f3aca
-SIZE (compiler-20180805.tar.gz) = 6993196
+TIMESTAMP = 1630689177
+SHA256 (closure-compiler-v20210808.jar) = 7e4cdd4086f902ad917a278e7805c9eb2d61f880fa52432b31b7128aea5e71b3
+SIZE (closure-compiler-v20210808.jar) = 12876667