diff --git a/java/libraries/javafx/.gitignore b/java/libraries/javafx/.gitignore
index 40f0c37ab..4d04bf96b 100644
--- a/java/libraries/javafx/.gitignore
+++ b/java/libraries/javafx/.gitignore
@@ -1,5 +1,5 @@
 # ignore the sdk download files
-javafx-*-sdk-*.zip
+javafx-*.zip
 
 # everything is downloaded from online
 /library
diff --git a/java/libraries/javafx/build.xml b/java/libraries/javafx/build.xml
index 82d95c16f..b7c87a37f 100644
--- a/java/libraries/javafx/build.xml
+++ b/java/libraries/javafx/build.xml
@@ -41,7 +41,7 @@
   https://gluonhq.com/download/javafx-16-sdk-linux
   -->
 
-  <!-- JavaFX was removed from the Oracle's JDK for ARM and Java 11.
+  <!-- JavaFX was removed from the Oracle JDK for ARM and Java 11.
        There are arm32 and aarch64 builds for Linux (compatible with the Pi?)
        but they're Early Access releases of JavaFX 17.
        Downloads page is at https://gluonhq.com/products/javafx/
@@ -56,8 +56,12 @@
        versions. Not a good way to mix, unless have unique JARs for each platform,
        which would be ~60 MB extra (for platforms that are < 2% usage). -->
 
+  <!--
+    https://download2.gluonhq.com/openjfx/17.0.0.1/openjfx-17.0.0.1_linux-x64_bin-sdk.zip
+    https://download2.gluonhq.com/openjfx/17.0.0.1/openjfx-17.0.0.1_osx-x64_bin-sdk.zip
+  -->
   <target name="retrieve-gluon">
-    <get src="https://gluonhq.com/download/${gluon.base}"
+    <get src="https://download2.gluonhq.com/openjfx/${gluon.version}/openjfx-${gluon.version}_${platform.name}-x64_bin-sdk.zip"
          dest="${gluon.base}.zip"
          usetimestamp="true" />
 
@@ -111,7 +115,7 @@
   </target>
 
   <target name="download-javafx">
-    <property name="gluon.version" value="16" />
+    <property name="gluon.version" value="17.0.0.1" />
     <!-- current Early Access version, includes support for other architectures -->
     <!-- <property name="gluon.version" value="17-ea" /> -->
 
@@ -120,17 +124,20 @@
 
     <!-- javafx-${gluon.version}-sdk-${gluon.platform} -->
     <antcall target="retrieve-gluon">
-      <param name="gluon.base" value="javafx-${gluon.version}-sdk-mac" />
+      <param name="gluon.base" value="javafx-${gluon.version}-macos" />
+      <param name="platform.name" value="osx" />
       <param name="platform.path" value="${library.path}/macosx" />
     </antcall>
 
     <antcall target="retrieve-gluon">
-      <param name="gluon.base" value="javafx-${gluon.version}-sdk-windows" />
+      <param name="gluon.base" value="javafx-${gluon.version}-windows" />
+      <param name="platform.name" value="windows" />
       <param name="platform.path" value="${library.path}/windows64" />
     </antcall>
 
     <antcall target="retrieve-gluon">
-      <param name="gluon.base" value="javafx-${gluon.version}-sdk-linux" />
+      <param name="gluon.base" value="javafx-${gluon.version}-linux" />
+      <param name="platform.name" value="linux" />
       <param name="platform.path" value="${library.path}/linux64" />
     </antcall>
   </target>
diff --git a/todo.txt b/todo.txt
index 0c6d772bf..b5593c452 100755
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,7 @@
 1278 (4.0b3)
+X Update appbundler with the latest from upstream
+X Replace JDK 11 and JavaFX 16 with JDK 17 and JavaFX 17
+X   https://github.com/processing/processing4/issues/285
 
 
 known issues
@@ -81,8 +84,6 @@ _   (built and tested a version of this code if we want to use it)
 
 before 4.x final
 _ clean up dist files, 'bin' and 'src' from Java Mode are included, iml files, etc
-_ Replace JDK 11 and JavaFX 16 with JDK 17 and JavaFX 17
-_   https://github.com/processing/processing4/issues/285
 _ turn off javafx web if not using
 _ SVG library, show a warning when using style instead of presentation attributes
 _ Welcome screen or not?