diff --git a/docs/changes.txt b/docs/changes.txt
index d2b8473fc8..f69b03c2d3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -70,6 +70,7 @@ Changes in behaviour which may result in build errors
 All:
 
 - Make wxList and wxVector iterators conform to input iterator requirements.
+- Fix MT-safety problem when reading and writing from wxSocket (jkubalik).
 
 wxGTK:
 
diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 8f64727d78..6146be5214 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -40,7 +40,7 @@ wxSocketOutputStream::~wxSocketOutputStream()
 
 size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-    const size_t ret = m_o_socket->Write(buffer, size).LastCount();
+    const size_t ret = m_o_socket->Write(buffer, size).LastWriteCount();
     m_lasterror = m_o_socket->Error()
                     ? m_o_socket->IsClosed() ? wxSTREAM_EOF
                                              : wxSTREAM_WRITE_ERROR
@@ -63,7 +63,7 @@ wxSocketInputStream::~wxSocketInputStream()
 
 size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
-    const size_t ret = m_i_socket->Read(buffer, size).LastCount();
+    const size_t ret = m_i_socket->Read(buffer, size).LastReadCount();
     m_lasterror = m_i_socket->Error()
                     ? m_i_socket->IsClosed() ? wxSTREAM_EOF
                                              : wxSTREAM_READ_ERROR