4 files changed, 17 insertions, 10 deletions

diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1
index efe3e195204d..169b372d8afb 100644
--- a/java/javavmwrapper/src/javavm.1
+++ b/java/javavmwrapper/src/javavm.1
@@ -129,8 +129,10 @@ Currently allowed versions are
 .Ql 11 ,
 .Ql 11+ ,
 .Ql 12 ,
+.Ql 12+ ,
+.Ql 13 ,
 and
-.Ql 12+ .
+.Ql 13+ .
 .It Ev JAVAVM_OPTS
 The contents of this environment variable will be passed to the invoked
 Java VM as options.
diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh
index 321623b16ec7..55cb07e1cd00 100644
--- a/java/javavmwrapper/src/javavmwrapper.sh
+++ b/java/javavmwrapper/src/javavmwrapper.sh
@@ -506,22 +506,25 @@ setJavaHome() {
         for version in ${JAVA_VERSION}; do
             case "${version}" in
                 *7+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13"
                     ;;
                 *8+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13"
                     ;;
                 *9+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13"
                     ;;
                 10+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13"
                     ;;
                 11+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13"
                     ;;
                 12+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13"
+                    ;;
+                13+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 13"
                     ;;
                 1.7)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 7"
diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1
index a621bc4c981e..308d401227b3 100644
--- a/java/javavmwrapper/src/manvm.1
+++ b/java/javavmwrapper/src/manvm.1
@@ -117,8 +117,10 @@ Currently allowed versions are
 .Ql 11 ,
 .Ql 11+ ,
 .Ql 12 ,
+.Ql 12+ ,
+.Ql 13 ,
 and
-.Ql 12+ .
+.Ql 13+ .
 .It Ev JAVAVM_OPTS
 The contents of this environment variable will be passed to the invoked
 .Nm man
diff --git a/java/javavmwrapper/src/registervm.1 b/java/javavmwrapper/src/registervm.1
index 16a73859e3c5..e80027aca10f 100644
--- a/java/javavmwrapper/src/registervm.1
+++ b/java/javavmwrapper/src/registervm.1
@@ -1,6 +1,6 @@
 .\"
 .\" Copyright (C) 2005 Greg Lewis. All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -10,7 +10,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE