diff --git a/checkin_notes b/checkin_notes
index 84621ba43b..2c68c4decc 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6507,3 +6507,14 @@ David  21 June 2006
         cpu_sched.C
     sched/
         file_upload_handler.C
+
+Rom    21 June 2006
+    - Bug Fix: Two setup failure logs that were sent to me indicate that 
+        the uninstall process didn’t clean up the BOINC entry in the 
+        service control manager.  Check, before attempting to shutdown, 
+        BOINC to make sure it is executing or is capable of responding 
+        to a ControlService event.    
+
+    win_build/installerv2/redist/Windows/src/boinccas
+        CAShutdownBOINC.cpp
+        boinccas.rc
diff --git a/win_build/boinc_cli_curl.vcproj b/win_build/boinc_cli_curl.vcproj
index 8947b9bedb..73cd7d8614 100644
--- a/win_build/boinc_cli_curl.vcproj
+++ b/win_build/boinc_cli_curl.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib1.lib ssleay32.lib libeay32.lib libcurl.lib MSVCRTD.LIB MSVCPRTD.LIB wsock32.lib wininet.lib winmm.lib libboincd.lib"
+				AdditionalDependencies="zlib1.lib ssleay32.lib libeay32.lib libcurl_imp.lib MSVCRTD.LIB MSVCPRTD.LIB wsock32.lib wininet.lib winmm.lib libboincd.lib"
 				OutputFile=".\Build\Debug/boinc.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -101,7 +101,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../lib;../api;../client/win;../client;..;../openssl/include;../curl/include"
+				AdditionalIncludeDirectories="../lib;../api;../client/win;../client;..;../openssl/include;../curl/include;../zlib/include"
 				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_MT;_DLL;_WINDOWS;_CONSOLE;_USE_CURL;USE_SSL;USE_SSLEAY;USE_OPENSSL"
 				StringPooling="FALSE"
 				RuntimeLibrary="2"
@@ -120,12 +120,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ssleay32.lib libeay32.lib libcurl.lib ssleay32.lib libeay32.lib libcurl.lib MSVCRT.LIB MSVCPRT.LIB wsock32.lib wininet.lib winmm.lib libboinc.lib"
+				AdditionalDependencies="zlib1.lib ssleay32.lib libeay32.lib libcurl_imp.lib MSVCRT.LIB MSVCPRT.LIB wsock32.lib wininet.lib winmm.lib libboinc.lib"
 				ShowProgress="0"
 				OutputFile=".\Build\Release/boinc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;../openssl/mswin/$(PROCESSOR_ARCHITECTURE)/lib&quot;;&quot;../curl/mswin/$(PROCESSOR_ARCHITECTURE)/lib&quot;;../../;Build/Release"
+				AdditionalLibraryDirectories="&quot;../openssl/mswin/$(PROCESSOR_ARCHITECTURE)/lib&quot;;&quot;../curl/mswin/$(PROCESSOR_ARCHITECTURE)/lib&quot;;../../;Build/Release;&quot;../zlib/mswin/$(PROCESSOR_ARCHITECTURE)/lib&quot;"
 				IgnoreAllDefaultLibraries="TRUE"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="TRUE"
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index fa7783e2c5..4df5ec31b0 100644
Binary files a/win_build/installerv2/BOINC.ism and b/win_build/installerv2/BOINC.ism differ
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.cpp
index a41f2dbe5a..c1fffb8268 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.cpp
+++ b/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.cpp
@@ -80,6 +80,12 @@ typedef SC_HANDLE (WINAPI *tCS)(
     LPSERVICE_STATUS    lpServiceStatus
 );
 
+// QueryServiceStatus()
+typedef BOOL (WINAPI *tQSS)(
+    SC_HANDLE           hService,
+    LPSERVICE_STATUS    lpServiceStatus
+);
+
 UINT CAShutdownBOINC::OnExecution()
 {
     SC_HANDLE schSCManager = NULL;
@@ -89,6 +95,7 @@ UINT CAShutdownBOINC::OnExecution()
     tOSCM pOSCM = NULL;
     tOS pOS = NULL;
     tCS pCS = NULL;
+    tQSS pQSS = NULL;
 
 
     HMODULE hAdvapi32 = LoadLibrary(_T("advapi32.dll"));
@@ -96,16 +103,18 @@ UINT CAShutdownBOINC::OnExecution()
         pOSCM = (tOSCM)GetProcAddress(hAdvapi32, _T("OpenSCManagerA"));
         pOS = (tOS)GetProcAddress(hAdvapi32, _T("OpenServiceA"));
         pCS = (tCS)GetProcAddress(hAdvapi32, _T("ControlService"));
-        if (!pOSCM && !pOS && !pCS) {
+        pQSS = (tQSS)GetProcAddress(hAdvapi32, _T("QueryServiceStatus"));
+        if (!pOSCM && !pOS && !pCS && !pQSS) {
             FreeLibrary(hAdvapi32);
             hAdvapi32 = NULL;
             pOSCM = NULL;
             pOS = NULL;
             pCS = NULL;
+            pQSS = NULL;
         }
     }
 
-    if (pOSCM && pOS && pCS) {
+    if (pOSCM && pOS && pCS && pQSS) {
         schSCManager = pOSCM( 
             NULL,                    // local machine 
             NULL,                    // ServicesActive database 
@@ -120,9 +129,16 @@ UINT CAShutdownBOINC::OnExecution()
          
             if (schService) 
             {
-                if (!pCS(schService, SERVICE_CONTROL_STOP, &ssStatus))
+                if (pQSS(schService, &ssStatus))
                 {
-                    uiReturn = ERROR_INSTALL_FAILURE;
+                    if (!((SERVICE_STOPPED == ssStatus.dwCurrentState) && 
+                          (SERVICE_STOP_PENDING == ssStatus.dwCurrentState)))
+                    {
+                        if (!pCS(schService, SERVICE_CONTROL_STOP, &ssStatus))
+                        {
+                            uiReturn = ERROR_INSTALL_FAILURE;
+                        }
+                    }
                 }
             }
         }
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc
index 276aaf58be..53e0331fb6 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc
+++ b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,5
- PRODUCTVERSION 1,0,0,5
+ FILEVERSION 1,0,0,6
+ PRODUCTVERSION 1,0,0,6
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "BOINC Dynamic Link Library"
-            VALUE "FileVersion", "1, 0, 0, 5"
+            VALUE "FileVersion", "1, 0, 0, 6"
             VALUE "InternalName", "BOINC"
             VALUE "LegalCopyright", "Copyright (C) 2005"
             VALUE "OriginalFilename", "BOINC.dll"
             VALUE "ProductName", " BOINC Dynamic Link Library"
-            VALUE "ProductVersion", "1, 0, 0, 5"
+            VALUE "ProductVersion", "1, 0, 0, 6"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/win_build/installerv2/redist/Windows/x86/boinccas.dll b/win_build/installerv2/redist/Windows/x86/boinccas.dll
index d72e71d9c2..6543556d52 100644
Binary files a/win_build/installerv2/redist/Windows/x86/boinccas.dll and b/win_build/installerv2/redist/Windows/x86/boinccas.dll differ
diff --git a/win_build/installerv2/redist/Windows/x86/boinccas95.dll b/win_build/installerv2/redist/Windows/x86/boinccas95.dll
index d697fcfb6c..bb0c5356f4 100644
Binary files a/win_build/installerv2/redist/Windows/x86/boinccas95.dll and b/win_build/installerv2/redist/Windows/x86/boinccas95.dll differ