diff --git a/devel/gradle/Makefile b/devel/gradle/Makefile
index 0d8ba2232dc6..ef1d97b37573 100644
--- a/devel/gradle/Makefile
+++ b/devel/gradle/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	gradle
-PORTVERSION=	8.2.1
+PORTVERSION=	8.6
 CATEGORIES=	devel java
-MASTER_SITES=	https://downloads.gradle.org/distributions/
+MASTER_SITES=	https://services.gradle.org/distributions/
 EXTRACT_SUFX=	-bin.zip
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Project automation tool
 WWW=		https://www.gradle.org/
 
 LICENSE=	APACHE20 BSD3CLAUSE CDDL EPL LGPL21+ MIT MPL20
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe zip
 USE_JAVA=	yes
 
 CONFLICTS_INSTALL=	gradle6 gradle62
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	gradle
 SUB_LIST=	JAVA=${JAVA} \
 		PORTVERSION=${PORTVERSION}
 PLIST_FILES=	bin/gradle
 PORTDATA=	*
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/gradle ${STAGEDIR}${PREFIX}/bin/gradle
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/devel/gradle/distinfo b/devel/gradle/distinfo
index 850c4be2903e..f5081077edf2 100644
--- a/devel/gradle/distinfo
+++ b/devel/gradle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691606659
-SHA256 (gradle-8.2.1-bin.zip) = 03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
-SIZE (gradle-8.2.1-bin.zip) = 128695158
+TIMESTAMP = 1706898873
+SHA256 (gradle-8.6-bin.zip) = 9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+SIZE (gradle-8.6-bin.zip) = 132788867
diff --git a/devel/gradle/files/gradle.in b/devel/gradle/files/gradle.in
index 25d4d31d87f5..fde29278e346 100644
--- a/devel/gradle/files/gradle.in
+++ b/devel/gradle/files/gradle.in
@@ -1,2 +1,3 @@
 #!/bin/sh
-exec "java" -Dorg.gradle.native=false $JAVA_OPTS -classpath "%%DATADIR%%/lib/gradle-launcher-%%PORTVERSION%%.jar" org.gradle.launcher.GradleMain "$@"
+DEFAULT_JVM_OPTS="-Xmx64m -Xms64m -javaagent:%%DATADIR%%/lib/agents/gradle-instrumentation-agent-%%PORTVERSION%%.jar"
+exec "java" -Dorg.gradle.native=false $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -classpath "%%DATADIR%%/lib/gradle-launcher-%%PORTVERSION%%.jar:$CLASSPATH" org.gradle.launcher.GradleMain "$@"
diff --git a/devel/gradle/pkg-descr b/devel/gradle/pkg-descr
index d22733f96b39..d4007bbda526 100644
--- a/devel/gradle/pkg-descr
+++ b/devel/gradle/pkg-descr
@@ -1,14 +1,16 @@
 Gradle is build automation evolved.
 
 Gradle can automate the building, testing, publishing, deployment
 and more of software packages or other types of projects such as
 generated static websites, generated documentation or indeed anything
 else.
 
 Gradle combines the power and flexibility of Ant with the dependency
 management and conventions of Maven into a more effective way to
 build. Powered by a Groovy DSL and packed with innovation, Gradle
 provides a declarative way to describe all kinds of builds through
 sensible defaults. Gradle is quickly becoming the build system of
 choice for many open source projects, leading edge enterprises and
 legacy automation challenges.
+
+See also <https://github.com/gradle/gradle>.