diff --git a/docs/changes.txt b/docs/changes.txt
index 1f6c6e447b..d6efbf31c2 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -139,6 +139,10 @@ wxMotif:
 
 - added 3 state checkbox
 
+wxMSW:
+
+- fixed UNC paths handling in wxFileSystem (Daniel Nash)
+
 wxWinCE:
 
 - added automatized but customizable handling of native SmartPhone menus
diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index cfdcb94335..814d17d6a6 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -519,7 +519,7 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
     // unc notation, wxMSW
     if ( url.Find(wxT("\\\\")) == 0 ) 
     {
-        url = url.Mid(2);
+        url = wxT("//") + url.Mid(2);
     }
     else
     {