diff --git a/checkin_notes b/checkin_notes
index 682981d600..cab8addec1 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -1746,3 +1746,15 @@ David  15 Feb 2007
     client/
         cs_apps.C
         makefile_sim
+
+Rom    17 Feb 2007
+    - WININSTALL: Use the Unicode version of ShutdownBOINCManager on NT based
+        platforms and use the ANSI version on 9X based platforms.
+        
+    win_build/installerv2/redist/Windows/src/boinccas/
+        CAShutdownBOINCManager.cpp
+        boinccas95.def
+        boinccas95.vcproj
+    win_build/installerv2/redist/Windows/x86
+        boinccas.dll
+        boinccas95.dll
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 473e294d30..551d17abca 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/CAShutdownBOINCManager.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINCManager.cpp
index d5e686c253..6bd6fd1ae4 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINCManager.cpp
+++ b/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINCManager.cpp
@@ -20,7 +20,9 @@
 
 #include "stdafx.h"
 #include "boinccas.h"
+#ifdef _UNICODE
 #include "terminate.h"
+#endif
 #include "CAShutdownBOINCManager.h"
 
 #define CUSTOMACTION_NAME               _T("CAShutdownBOINCManager")
@@ -109,8 +111,10 @@ UINT CAShutdownBOINCManager::OnExecution()
 
     }
 
+#ifdef _UNICODE
     TerminateProcessEx( tstring(_T("boincmgr.exe")) );
     TerminateProcessEx( tstring(_T("gridrepublic.exe")) );
+#endif
     return ERROR_SUCCESS;
 }
 
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc
index 8aa30967e0..e6e987081d 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,15
- PRODUCTVERSION 1,0,0,15
+ FILEVERSION 1,0,0,20
+ PRODUCTVERSION 1,0,0,20
  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.15"
+            VALUE "FileVersion", "1.0.0.20"
             VALUE "InternalName", "BOINC"
-            VALUE "LegalCopyright", "Copyright (C) 2005"
+            VALUE "LegalCopyright", "Copyright (C) 2005-2007"
             VALUE "OriginalFilename", "BOINC.dll"
             VALUE "ProductName", " BOINC Dynamic Link Library"
-            VALUE "ProductVersion", "1.0.0.15"
+            VALUE "ProductVersion", "1.0.0.20"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.def b/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.def
index 1a87df5b38..b3df3d9e02 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.def
+++ b/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.def
@@ -10,3 +10,5 @@ EXPORTS
 	MigrateCPDNBBC
 	RestoreSetupState
 	SaveSetupState
+	ShutdownBOINCManager
+
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.vcproj b/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.vcproj
index b1ec49a022..9588cd6175 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.vcproj
+++ b/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.vcproj
@@ -141,6 +141,9 @@
 			<File
 				RelativePath=".\CASaveSetupState.cpp">
 			</File>
+			<File
+				RelativePath=".\CAShutdownBOINCManager.cpp">
+			</File>
 			<File
 				RelativePath=".\CAValidateSetupType.cpp">
 			</File>
@@ -178,6 +181,9 @@
 			<File
 				RelativePath=".\CASaveSetupState.h">
 			</File>
+			<File
+				RelativePath=".\CAShutdownBOINCManager.h">
+			</File>
 			<File
 				RelativePath=".\CAValidateSetupType.h">
 			</File>
diff --git a/win_build/installerv2/redist/Windows/x86/boinccas.dll b/win_build/installerv2/redist/Windows/x86/boinccas.dll
index 6cc3ab0ee6..0b2872e2d0 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 df9ca5a6e6..a91f40afa1 100644
Binary files a/win_build/installerv2/redist/Windows/x86/boinccas95.dll and b/win_build/installerv2/redist/Windows/x86/boinccas95.dll differ