--- src/javavm.1.ori	2019-05-26 22:24:48.027038000 -0700
+++ src/javavm.1	2019-05-29 17:53:17.795461000 -0700
@@ -100,11 +100,9 @@
 The selected Java VM must have been released by one of the vendors in the list.
 .Pp
 Currently allowed vendors are
-.Ql bsdjava ,
-.Ql freebsd ,
-.Ql openjdk
+.Ql oracle
 and
-.Ql sun .
+.Ql openjdk.
 .It Ev JAVA_VERSION
 A space delimited list of versions of the Java VM that may be used.
 By appending a
@@ -113,13 +111,17 @@
 equal to the given version will be used.
 .Pp
 Currently allowed versions are
-.Ql 1.5 ,
-.Ql 1.5+ ,
 .Ql 1.6 ,
 .Ql 1.6+ ,
-.Ql 1.7
+.Ql 1.7 ,
+.Ql 1.7+ ,
+.Ql 1.8 ,
+.Ql 1.8+ ,
+.Ql 11 ,
+.Ql 11+ ,
+.Ql 12+ ,
 and
-.Ql 1.7+ .
+.Ql 12+ .
 .It Ev JAVAVM_OPTS
 The contents of this environment variable will be passed to the invoked
 Java VM as options.
@@ -179,16 +181,16 @@
 .Dq native
 Java VM registered with
 .Nm .
-.It Ev JAVA_VERSION=1.5+ Pa %%LOCALBASE%%/bin/javac MyClass.java
+.It Ev JAVA_VERSION=1.8+ Pa %%LOCALBASE%%/bin/javac MyClass.java
 Compile MyClass.java with a registered Java VM's javac that is at least
-version 1.5.
+version 1.8.
 .It Ev JAVA_OS=native Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
 Execute MyApp with the most up to date native Java VM that is registered
 with
 .Nm .
 This is necessary if MyApp uses JNI, for instance.
-.It Ev JAVA_VERSION="1.5 1.7" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
-Execute MyApp with either a Java VM that is either version 1.5 or version 1.7.
+.It Ev JAVA_VERSION="1.8 11" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
+Execute MyApp with either a Java VM that is either version 1.8 or version 11.
 .It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java
 Don't invoke the Java VM, but print out information about what would have
 been done.
--- src/javavmwrapper.sh.ori	2019-05-26 22:25:09.507949000 -0700
+++ src/javavmwrapper.sh	2019-05-29 17:59:14.500768000 -0700
@@ -501,16 +501,19 @@
         for version in ${JAVA_VERSION}; do
             case "${version}" in
                 1.6+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 1.9"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 11 12"
                     ;;
                 1.7+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 1.9"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 11 12"
                     ;;
                 1.8+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 1.9"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 11 12"
                     ;;
-                1.9+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.9"
+                11+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12"
+                    ;;
+                12+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
                     ;;
                 *)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
@@ -528,8 +531,10 @@
         # Respect JAVA_VERSION
         if [ -n "${JAVA_VERSION}" ]; then
             _JAVAVM_VERSION=`echo ${_JAVAVM_VM} | \
-                sed -e 's|^[^0-9]*\([0-9]\)\.\([0-9]\)\.[0-9]$|\1.\2|' \
-                    -e 's|^[^0-9]*\([0-9]\)$|1.\1|'`
+                sed -e 's|^[^0-9]*\([0-9]*\)$|\1|'`
+            if [ ${_JAVAVM_VERSION} -le 8 ]; then
+                _JAVAVM_VERSION="1.${_JAVAVM_VERSION}"
+            fi
             for _JAVAVM_REQUESTED_VERSION in ${JAVA_VERSION}; do
                 if [ "${_JAVAVM_VERSION}" = "${_JAVAVM_REQUESTED_VERSION}" ]; then
                     _JAVAVM_VERSION=
@@ -568,9 +573,6 @@
                 openjdk*)
                     _JAVAVM_VENDOR=openjdk
                     ;;
-                linux-sun*)
-                    _JAVAVM_VENDOR=sun
-                    ;;
                 linux-oracle*)
                     _JAVAVM_VENDOR=oracle
                     ;;
--- src/manvm.1.ori	2019-05-26 22:25:34.649895000 -0700
+++ src/manvm.1	2019-05-26 22:34:07.235283000 -0700
@@ -87,11 +87,9 @@
 been released by one of the vendors in the list.
 .Pp
 Currently allowed vendors are
-.Ql bsdjava ,
-.Ql freebsd ,
 .Ql openjdk
 and
-.Ql sun .
+.Ql oracle .
 .It Ev JAVA_VERSION
 A space delimited list of versions of the Java VM from which the on-line
 manual pages may come.
@@ -101,13 +99,17 @@
 greater than or equal to the given version will be used.
 .Pp
 Currently allowed versions are
-.Ql 1.5 ,
-.Ql 1.5+ ,
 .Ql 1.6 ,
 .Ql 1.6+ ,
-.Ql 1.7
+.Ql 1.7 ,
+.Ql 1.7+ ,
+.Ql 1.8 ,
+.Ql 1.8+ ,
+.Ql 11 ,
+.Ql 11+ ,
+.Ql 12 ,
 and
-.Ql 1.7+ .
+.Ql 12+ .
 .It Ev JAVAVM_OPTS
 The contents of this environment variable will be passed to the invoked
 .Nm man