Index: trunk/linux/latest/usr/bin/josm-latest
===================================================================
--- trunk/linux/latest/usr/bin/josm-latest	(revision 15379)
+++ trunk/linux/latest/usr/bin/josm-latest	(revision 15491)
@@ -10,7 +10,9 @@
 ARCH="`dpkg --print-architecture 2> /dev/null || true`"
 
+JAVA_CMDS="$JAVA_HOME/bin/java"
+
 # If OpenJDK is only available headless, do not try it
-if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
-	JAVA_CMDS="$JAVA_HOME/bin/java"
+if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null \
+|| dpkg --get-selections 'openjdk-*-jre:$ARCH' | grep install$ > /dev/null ; then
 	# LTS versions in decreased order
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
@@ -23,7 +25,7 @@
 	# Development version
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-14-openjdk/bin/java /usr/lib/jvm/java-14-openjdk-$ARCH/bin/java"
-else
-	JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
 fi
+# Undetermined version
+JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/default-java/bin/java /usr/bin/java"
 
 if [ -f /etc/default/josm-latest ]; then