diff --git a/docs/changes.txt b/docs/changes.txt
index 8498772603..a9899c4fac 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -594,6 +594,7 @@ wxMSW:
 - Fix blank wxBitmapComboBox dropdown appearance.
 - Make "%lu" work with size_t arguments under Win64 (laro).
 - Fix wxRegion::Offset() with shared objects (Joost Nieuwenhuijse).
+- Fix wxSocket::Initialize() after Shutdown() (Laurent Poujoulat).
 
 wxOSX:
 
diff --git a/src/msw/sockmsw.cpp b/src/msw/sockmsw.cpp
index 7bad1d450b..58557e4e6c 100644
--- a/src/msw/sockmsw.cpp
+++ b/src/msw/sockmsw.cpp
@@ -191,7 +191,7 @@ wxDynamicLibrary wxSocketMSWManager::gs_wsock32dll;
 
 bool wxSocketMSWManager::OnInit()
 {
-  static LPCTSTR pclassname = NULL;
+  LPCTSTR pclassname = NULL;
   int i;
 
   /* Create internal window for event notifications */