Index: trunk/linux/latest/usr/bin/josm-latest
===================================================================
--- trunk/linux/latest/usr/bin/josm-latest	(revision 13547)
+++ trunk/linux/latest/usr/bin/josm-latest	(revision 13700)
@@ -14,9 +14,13 @@
 	JAVA_CMDS="$JAVA_HOME/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java /usr/lib/jvm/java-10-oracle/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java /usr/lib/jvm/java-11-oracle/bin/java"
 else
 	JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-oracle/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-oracle/bin/java"
 fi
 
@@ -47,5 +51,5 @@
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm-latest." || true
-    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
+    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ] || [ "`expr match \"${JAVACMD}\" 'java-10'`" != "0" ]; then
         JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
     fi
Index: trunk/linux/tested/usr/bin/josm
===================================================================
--- trunk/linux/tested/usr/bin/josm	(revision 13547)
+++ trunk/linux/tested/usr/bin/josm	(revision 13700)
@@ -14,9 +14,13 @@
 	JAVA_CMDS="$JAVA_HOME/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java /usr/lib/jvm/java-10-oracle/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java /usr/lib/jvm/java-11-oracle/bin/java"
 else
 	JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-oracle/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-oracle/bin/java"
 fi
 
@@ -47,5 +51,5 @@
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm." || true
-    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
+    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ] || [ "`expr match \"${JAVACMD}\" 'java-10'`" != "0" ]; then
         JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
     fi