diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html
index c77724bf2..e0178465c 100644
--- a/Doc/Manual/Java.html
+++ b/Doc/Manual/Java.html
@@ -5693,6 +5693,17 @@ The most important of these implement the mapping of C/C++ types to Java types:
     In other words the typemap provides the conversion from the native method call return type. </td>
 </tr>
 
+<tr>
+<td>jboxtype</td>
+<td>Java boxed type.
+  These are Java code typemaps to provide the Java boxed type, such as, <tt>Integer</tt> for C type <tt>int</tt>.
+    As autoboxing is only relevant to the Java primitive types, these are only provided for the
+    C types that map to Java primitive types.
+    This typemap is usually only used by C++ STL container wrappers that are wrapped by Java generic
+    types as the boxed type must be used instead of the unboxed/primitive type when declaring a Java generic type.
+    </td>
+</tr>
+
 <tr>
 <td>javadirectorin</td>
 <td>Conversion from jtype to jstype for director methods.
diff --git a/Lib/java/java.swg b/Lib/java/java.swg
index e0ddcba02..b49826ba0 100644
--- a/Lib/java/java.swg
+++ b/Lib/java/java.swg
@@ -111,25 +111,24 @@ SWIGINTERN jint SWIG_JavaIntFromSize_t(size_t size) {
 %typemap(jstype) double,             const double &             "double"
 %typemap(jstype) void                                           "void"
 
-%typemap(jboxtype) bool                 "Boolean"
-%typemap(jboxtype) char                 "Character"
-%typemap(jboxtype) signed char          "Byte"
-%typemap(jboxtype) unsigned char        "Short"
-%typemap(jboxtype) short                "Short"
-%typemap(jboxtype) unsigned short       "Integer"
-%typemap(jboxtype) int                  "Integer"
-%typemap(jboxtype) unsigned int         "Long"
-%typemap(jboxtype) long                 "Integer"
-%typemap(jboxtype) unsigned long        "Long"
-%typemap(jboxtype) long long            "Long"
-%typemap(jboxtype) unsigned long long   "java.math.BigInteger"
-%typemap(jboxtype) float                "Float"
-%typemap(jboxtype) double               "Double"
+%typemap(jboxtype) bool,               const bool &               "Boolean"
+%typemap(jboxtype) char,               const char &               "Character"
+%typemap(jboxtype) signed char,        const signed char &        "Byte"
+%typemap(jboxtype) unsigned char,      const unsigned char &      "Short"
+%typemap(jboxtype) short,              const short &              "Short"
+%typemap(jboxtype) unsigned short,     const unsigned short &     "Integer"
+%typemap(jboxtype) int,                const int &                "Integer"
+%typemap(jboxtype) unsigned int,       const unsigned int &       "Long"
+%typemap(jboxtype) long,               const long &               "Integer"
+%typemap(jboxtype) unsigned long,      const unsigned long &      "Long"
+%typemap(jboxtype) long long,          const long long &          "Long"
+%typemap(jboxtype) unsigned long long, const unsigned long long & "java.math.BigInteger"
+%typemap(jboxtype) float,              const float &              "Float"
+%typemap(jboxtype) double,             const double &             "Double"
 
 %typemap(jni) char *, char *&, char[ANY], char[]               "jstring"
 %typemap(jtype) char *, char *&, char[ANY], char[]               "String"
 %typemap(jstype) char *, char *&, char[ANY], char[]               "String"
-%typemap(jboxtype) char *, char *&, char[ANY], char[]               "String"
 
 /* JNI types */
 %typemap(jni) jboolean      "jboolean"