diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 597c9a8..855659d 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -2,22 +2,20 @@
 # Contributor: Michele Schäuble <mschaeuble@swissonline.ch>
 
 pkgname=josm
-pkgver=18463
+pkgver=18583
 pkgrel=1
 pkgdesc="An editor for OpenStreetMap written in Java"
 arch=('any')
 url="https://josm.openstreetmap.de/"
 license=('GPL')
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'java-runtime>=11' 'libxtst' 'ttf-font')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'java-openjfx>=11' 'java-runtime>=11' 'libxtst' 'ttf-font')
 makedepends=('subversion')
 changelog=$pkgname.changelog
 backup=('etc/conf.d/josm')
 source=(https://josm.openstreetmap.de/download/$pkgname-snapshot-$pkgver.jar
-        $pkgname.conf.d
         $pkgname::svn+https://josm.openstreetmap.de/svn/trunk#revision=$pkgver)
 noextract=($pkgname-snapshot-$pkgver.jar)
-sha256sums=('fbef17b73032909fbce4abf3cb7c60699a0a695949c33f82b75c5bfd0902d467'
-            '29377ce55c50951b1bd0e39003a977d8ea558c0657d613cea5f0056ce255e60e'
+sha256sums=('e92e84ee78130815dbd1ea4f7d8c48b302ef7e6f6bd90974c203acfcfc699883'
             'SKIP')
 
 package() {
@@ -39,20 +37,15 @@ package() {
       install -Dm644 $pkgname/native/linux/tested/usr/share/icons/hicolor/${_icon}x${_icon}/apps/org.openstreetmap.josm.png \
         "${pkgdir}"/usr/share/icons/hicolor/${_icon}x${_icon}/apps/org.openstreetmap.josm.png
   done
-
-#executable file
-  install -d "${pkgdir}"/usr/bin
-  cat <<"EOF" >"${pkgdir}"/usr/bin/$pkgname 
-#!/bin/sh
-# source application-specific settings
-while true; do
-    JOSM_ARGS=
-    [ -f /etc/conf.d/josm ] && . /etc/conf.d/josm
-    CLASSPATH="/usr/share/java/josm/josm.jar"
-    java ${JOSM_ARGS} -cp "${CLASSPATH}" -Djosm.restart=true org.openstreetmap.josm.gui.MainApplication "$@"
-    [ $? -eq 9 ] || break
-done
-EOF
-  chmod 755 "${pkgdir}"/usr/bin/$pkgname
-  install -Dm644 "${srcdir}"/$pkgname.conf.d "${pkgdir}"/etc/conf.d/$pkgname
+  
+  install -Dm755 "${pkgname}/native/linux/tested/usr/bin/josm" "${pkgdir}/usr/bin/josm"
+  install -Dm644 "${pkgname}/native/linux/tested/etc/default/josm" "${pkgdir}/etc/default/josm"
+  # Add arch env vars to top of josm script
+  sed -i '4 aJOSM_PATH="/usr/share/java/josm/josm.jar"' "${pkgdir}/usr/bin/josm"
+  # This is a hack -- Arch puts the JavaFX modules in with the rest of the JVM
+  # modules, but the JVM doesn't automatically load them.
+  # Otherwise, we could remove the module-path for JAVAFX_HOME in the start
+  # script.
+  # sed -i 's/--module-path ${JAVAFX_HOME} //' "${pkgdir}/usr/bin/josm"
+  sed -i '5 aJAVAFX_HOME="$(ls /usr/lib/jvm/default-runtime/lib/javafx*.jar | tr "\n" ":" | sed '"'"'s/.$//'"'"')"' "${pkgdir}/usr/bin/josm"
 }
diff --git a/trunk/josm.conf.d b/trunk/josm.conf.d
deleted file mode 100644
index c67ba8a..0000000
--- a/trunk/josm.conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Parameters for JOSM editor
-#
-#JOSM_ARGS="-Xmx800M"
-
-#FS#72953 https://bugs.archlinux.org/task/72953
-JOSM_ARGS="--add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED"