diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index fae3a47b99..9e85831c5b 100644
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -141,6 +141,8 @@ shrink.
 wxMSW: When converting a wx.Icon to a bitmap check if the icon has an
 alpha channel and set the bitmap to use it.
 
+Fixed the wrong class name used in wx.PyScrolledWindow's call to
+_setCallbackInfo.
 
 
 
diff --git a/wxPython/src/_pywindows.i b/wxPython/src/_pywindows.i
index fb6b59057e..69b423e84f 100644
--- a/wxPython/src/_pywindows.i
+++ b/wxPython/src/_pywindows.i
@@ -444,7 +444,7 @@ MustHaveApp(wxPyScrolledWindow);
 class wxPyScrolledWindow : public wxScrolledWindow
 {
 public:
-    %pythonAppend wxPyScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
+    %pythonAppend wxPyScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyScrolledWindow)"
     %pythonAppend wxPyScrolledWindow()       ""
 
     wxPyScrolledWindow(wxWindow* parent, const wxWindowID id=-1,