diff --git a/docs/changes.txt b/docs/changes.txt
index 390dbbb014..a0d08e31ac 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -91,9 +91,13 @@ Major new features in 2.8 release
 2.8.7
 -----
 
+All:
+
+- Fixed bug with default proxy destruction in wxURL (Axel Gembe)
+
 All (GUI):
 
-- wxGraphicsContext implementations now all have the pixel's center at (0.5,0.5), 
+- wxGraphicsContext implementations now all have the pixel's center at (0.5,0.5),
   avoiding differences in anti-aliasing between platforms.
 - wxChoicebook now vertically centres a left-aligned controller.
 
@@ -134,7 +138,7 @@ All (GUI):
   is shown.
 - Multiple centre panes in wxAUI can now be resized.
 - Add support for reading alpha data from TIFF images.
-  
+
 wxMSW:
 
 - Fixed a bug with a spurious border appearing on wxStatusBar under Windows XP/Vista.
@@ -147,9 +151,9 @@ wxGTK:
   parent window. This also solves a problem with being able
   to change the selection of a wxListCtrl while editing a
   label.
-- Correct context menu event coming from wxListCtrl to 
+- Correct context menu event coming from wxListCtrl to
   have the right ID (not that from the client window).
-  
+
 wxMac:
 
 - Fixed a crash in wxToolBar when adding tools with non-standard sizes.
diff --git a/src/common/url.cpp b/src/common/url.cpp
index 700cb18d7e..6bd227c2b5 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -406,6 +406,8 @@ void wxURL::SetProxy(const wxString& url_proxy)
 class wxURLModule : public wxModule
 {
 public:
+    wxURLModule();
+
     virtual bool OnInit();
     virtual void OnExit();
 
@@ -415,6 +417,13 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)
 
+wxURLModule::wxURLModule()
+{
+    // we must be cleaned up before wxSocketModule as otherwise deleting
+    // ms_proxyDefault from our OnExit() won't work (and can actually crash)
+    AddDependency(wxClassInfo::FindClass(_T("wxSocketModule")));
+}
+
 bool wxURLModule::OnInit()
 {
 #if wxUSE_PROTOCOL_HTTP