diff --git a/CHANGES.current b/CHANGES.current
index 34117a214..2c59d49ce 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -3,6 +3,10 @@
 Version 1.3.37 (in progress)
 ============================
 
+2008-11-01: wsfulton
+            Add patch #2128249 from Anatoly Techtonik which corrects the C/C++ proxy
+            class being reported for Python docstrings when %rename is used.
+
 2008-11-01: wsfulton
             Add the strip encoder patch from Anatoly Techtonik #2130016. This enables an 
             easy way to rename symbols by stripping a commonly used prefix in all the
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 9e6409af6..b455de890 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1341,9 +1341,9 @@ public:
 	    String *str = Getattr(n, "feature:docstring");
 	    if (str == NULL || Len(str) == 0) {
 	      if (CPlusPlus) {
-		Printf(doc, "Proxy of C++ %s class", class_name);
+		Printf(doc, "Proxy of C++ %s class", real_classname);
 	      } else {
-		Printf(doc, "Proxy of C %s struct", class_name);
+		Printf(doc, "Proxy of C %s struct", real_classname);
 	      }
 	    }
 	  }