diff --git a/checkin_notes b/checkin_notes
index 88264be412..17818d2c5c 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6278,3 +6278,10 @@ Charlie 28 Oct 2012
         DlgGenericMessage.cpp
         ProjectInfoPage.cpp
         WelcomePage.cpp
+
+Charlie 20 Nov 2012
+    - Fix creation of strings for paths to client executable and data directory 
+        on Windows.
+
+    clientgui/
+        BOINCClientManager.cpp
diff --git a/clientgui/BOINCClientManager.cpp b/clientgui/BOINCClientManager.cpp
index a531acea6f..7d9e53943d 100644
--- a/clientgui/BOINCClientManager.cpp
+++ b/clientgui/BOINCClientManager.cpp
@@ -219,6 +219,7 @@ bool CBOINCClientManager::StartupBOINCCore() {
 
     bool                bReturnValue = false;
     wxString            strExecute = wxEmptyString;
+    wxString            strDataDir = wxEmptyString;
 
     if (IsBOINCCoreRunning()) return true;
 
@@ -235,7 +236,7 @@ bool CBOINCClientManager::StartupBOINCCore() {
 
         // Append boinc.exe to the end of the strExecute string and get ready to rock
         strExecute.Printf(
-            wxT("\"%s\\boinc.exe\" --redirectio --launched_by_manager %s"),
+            wxT("\"%sboinc.exe\" --redirectio --launched_by_manager %s"),
             wxGetApp().GetRootDirectory().c_str(),
             wxGetApp().GetArguments().c_str()
         );
@@ -255,7 +256,8 @@ bool CBOINCClientManager::StartupBOINCCore() {
         if (wxGetApp().GetDataDirectory().empty()) {
             pszDataDirectory = NULL;
         } else {
-            pszDataDirectory = (const char*)wxGetApp().GetDataDirectory().mb_str();
+            strDataDir = wxGetApp().GetDataDirectory();
+            pszDataDirectory = (const char*)strDataDir.mb_str();
         }
 
         wxLogTrace(wxT("Function Status"), wxT("CMainDocument::StartupBOINCCore - pszExecute '%s'\n"), pszExecute);