diff --git a/native/linux/latest/usr/bin/josm-latest b/native/linux/latest/usr/bin/josm-latest
index ee00638d3a..b7887d78f7 100755
--- a/native/linux/latest/usr/bin/josm-latest
+++ b/native/linux/latest/usr/bin/josm-latest
@@ -92,10 +92,21 @@ if [ "$JAVACMD" ]; then
     JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"
     if [[ "${JAVA_VERSION}" -ge 11 ]]; then
         if [[ -e "${JAVAFX_HOME}" ]]; then
-            JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+            if [[ -n "${JOSM_MODULEPATH}" ]]; then
+                JOSM_MODULEPATH="${JOSM_MODULEPATH}:${JAVAFX_HOME}"
+            else
+                JOSM_MODULEPATH="${JAVAFX_HOME}"
+            fi
+
+            JAVA_OPTS="--add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web ${JAVA_OPTS}"
         else
-            JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS"
+            JAVA_OPTS="--add-modules java.scripting,java.sql ${JAVA_OPTS}"
+        fi
+
+        if [[ -n "${JOSM_MODULEPATH}" ]]; then
+            JAVA_OPTS="--module-path ${JOSM_MODULEPATH} ${JAVA_OPTS}"
         fi
+        
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.security.action=ALL-UNNAMED"
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED"
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
diff --git a/native/linux/tested/usr/bin/josm b/native/linux/tested/usr/bin/josm
index fb61b9c34e..f8d8f2e498 100755
--- a/native/linux/tested/usr/bin/josm
+++ b/native/linux/tested/usr/bin/josm
@@ -92,10 +92,21 @@ if [ "$JAVACMD" ]; then
     JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"
     if [[ "${JAVA_VERSION}" -ge 11 ]]; then
         if [[ -e "${JAVAFX_HOME}" ]]; then
-            JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+            if [[ -n "${JOSM_MODULEPATH}" ]]; then
+                JOSM_MODULEPATH="${JOSM_MODULEPATH}:${JAVAFX_HOME}"
+            else
+                JOSM_MODULEPATH="${JAVAFX_HOME}"
+            fi
+
+            JAVA_OPTS="--add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web ${JAVA_OPTS}"
         else
-            JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS"
+            JAVA_OPTS="--add-modules java.scripting,java.sql ${JAVA_OPTS}"
+        fi
+
+        if [[ -n "${JOSM_MODULEPATH}" ]]; then
+            JAVA_OPTS="--module-path ${JOSM_MODULEPATH} ${JAVA_OPTS}"
         fi
+
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.security.action=ALL-UNNAMED"
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED"
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"