diff --git a/CHANGES.current b/CHANGES.current
index 2566ed8eb..2585b2a38 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,6 +1,10 @@
 Version 1.3.34 (in progress)
 ============================
 
+01/30/2008: mgossage
+	    Small update to documentation in Typemaps.html, to warn about use of local 
+	    variables in typemaps for multiple types.
+
 01/25/2008: wsfulton
 	    [Java] Fix bug reported by Kevin Mills in ARRAYSOFCLASSES typemaps where any
             changes made to an array element passed from Java to C are not reflected back
diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html
index f4bd832a1..10f3424eb 100644
--- a/Doc/Manual/Typemaps.html
+++ b/Doc/Manual/Typemaps.html
@@ -1617,6 +1617,27 @@ Some typemaps do not recognize local variables (or they may simply not
 apply). At this time, only typemaps that apply to argument conversion support this.
 </p>
 
+<p>
+<b>Note:</b>
+</p>
+
+<p>
+When declaring a typemap for multiple types, 
+each type must have its own local variable declaration.
+</p>
+
+<div class="code">
+<pre>
+%typemap(in) const std::string *, std::string * (std::string temp) // NO!
+// only std::string * has a local variable
+// const std::string * does not (oops)
+....
+
+%typemap(in) const std::string * (std::string temp), std::string * (std::string temp) // Correct
+....
+</pre>
+</div>
+
 
 <H3><a name="Typemaps_special_variables"></a>10.4.3 Special variables</H3>