diff --git a/checkin_notes b/checkin_notes
index c8bd84fb17..d12a5d2fe4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2636,3 +2636,17 @@ David  7 Apr 2010
 
     client/
         gui_rpc_server_ops.cpp
+
+Rom    8 Apr 2010
+    - WINSETUP: Add support for the <team_name> tag in the Windows
+        installer for the auto created project_init.xml file.
+        
+    win_build/installerv2/redist/Windows/src/boinccas/
+        boinccas.rc
+        CACreateProjectInitFile.cpp
+    win_build/installerv2/redist/Windows/Win32/
+        boinccas.dll
+        boinccas95.dll
+    win_build/installerv2/redist/Windows/x64/
+        boinccas.dll
+        boinccas95.dll
diff --git a/win_build/installerv2/redist/Windows/Win32/boinccas.dll b/win_build/installerv2/redist/Windows/Win32/boinccas.dll
index f44739b464..94d31e2751 100644
Binary files a/win_build/installerv2/redist/Windows/Win32/boinccas.dll and b/win_build/installerv2/redist/Windows/Win32/boinccas.dll differ
diff --git a/win_build/installerv2/redist/Windows/Win32/boinccas95.dll b/win_build/installerv2/redist/Windows/Win32/boinccas95.dll
index 67a27a6772..0987de6b56 100644
Binary files a/win_build/installerv2/redist/Windows/Win32/boinccas95.dll and b/win_build/installerv2/redist/Windows/Win32/boinccas95.dll differ
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CACreateProjectInitFile.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CACreateProjectInitFile.cpp
index 53087d82bc..dca2e13821 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/CACreateProjectInitFile.cpp
+++ b/win_build/installerv2/redist/Windows/src/boinccas/CACreateProjectInitFile.cpp
@@ -64,6 +64,7 @@ UINT CACreateProjectInitFile::OnExecution()
     tstring          strDataDirectory;
     tstring          strProjectInitUrl;
     tstring          strProjectInitAuthenticator;
+    tstring          strProjectInitTeamName;
     tstring          strProjectInitFile;
     UINT             uiReturnValue = -1;
 
@@ -77,6 +78,9 @@ UINT CACreateProjectInitFile::OnExecution()
     uiReturnValue = GetProperty( _T("PROJINIT_AUTH"), strProjectInitAuthenticator );
     if ( uiReturnValue ) return uiReturnValue;
 
+    uiReturnValue = GetProperty( _T("PROJINIT_TEAMNAME"), strProjectInitTeamName );
+    if ( uiReturnValue ) return uiReturnValue;
+
 
     if (!strProjectInitUrl.empty()) {
 
@@ -93,10 +97,12 @@ UINT CACreateProjectInitFile::OnExecution()
             _T("    <name>%s</name>\n")
             _T("    <url>%s</url>\n")
             _T("    <account_key>%s</account_key>\n")
+            _T("    <team_name>%s</team_name>\n")
             _T("</project_init>\n"),
             strProjectInitUrl.c_str(),
             strProjectInitUrl.c_str(),
-            !strProjectInitAuthenticator.empty() ? strProjectInitAuthenticator.c_str() : _T("")
+            !strProjectInitAuthenticator.empty() ? strProjectInitAuthenticator.c_str() : _T(""),
+            !strProjectInitTeamName.empty() ? strProjectInitTeamName.c_str() : _T("")
         );
 
         fclose(fProjectInitFile);
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc
index 996204ac07..3a302e82bf 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,150
- PRODUCTVERSION 1,0,0,150
+ FILEVERSION 1,0,0,155
+ PRODUCTVERSION 1,0,0,155
  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.150"
+            VALUE "FileVersion", "1.0.0.155"
             VALUE "InternalName", "BOINC"
-            VALUE "LegalCopyright", "Copyright (C) 2005-2009"
+            VALUE "LegalCopyright", "Copyright (C) 2005-2010"
             VALUE "OriginalFilename", "BOINC.dll"
             VALUE "ProductName", " BOINC Dynamic Link Library"
-            VALUE "ProductVersion", "1.0.0.150"
+            VALUE "ProductVersion", "1.0.0.155"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/win_build/installerv2/redist/Windows/x64/boinccas.dll b/win_build/installerv2/redist/Windows/x64/boinccas.dll
index 310887bbe7..3da6ca2cae 100644
Binary files a/win_build/installerv2/redist/Windows/x64/boinccas.dll and b/win_build/installerv2/redist/Windows/x64/boinccas.dll differ
diff --git a/win_build/installerv2/redist/Windows/x64/boinccas95.dll b/win_build/installerv2/redist/Windows/x64/boinccas95.dll
index cce753a2cd..0b6be2034f 100644
Binary files a/win_build/installerv2/redist/Windows/x64/boinccas95.dll and b/win_build/installerv2/redist/Windows/x64/boinccas95.dll differ