diff --git a/gradle-bootstrap.changes b/gradle-bootstrap.changes
index 52bcf34..5e89ca9 100644
--- a/gradle-bootstrap.changes
+++ b/gradle-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 20 04:42:28 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Modify the launcher so that gradle-bootstrap can work with
+  Java 17
+
 -------------------------------------------------------------------
 Mon May 16 12:19:47 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/gradle-launcher.sh.in b/gradle-launcher.sh.in
index db03102..8fd6b5d 100644
--- a/gradle-launcher.sh.in
+++ b/gradle-launcher.sh.in
@@ -26,4 +26,8 @@ function splitJvmOpts() {
 eval splitJvmOpts $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=gradle"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.launcher.GradleMain "$@"
+JAVA_VER=$($JAVACMD -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*".*/\1\2/p;')
+GRDL_JAVA_OPTS=
+[ "$JAVA_VER" -ge 160 ] && GRDL_JAVA_OPTS+="--add-opens java.base/java.lang=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"
+
+exec "$JAVACMD" ${GRDL_JAVA_OPTS} "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.launcher.GradleMain "$@"