diff --git a/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am b/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am
index 2eaf19ba..037e6e41 100755
--- a/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am
+++ b/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am
@@ -69,20 +69,19 @@ vpath %.cpp $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR)
 $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv 
 	@echo [======== Updating msi and msm numbe ========]
 	"$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msi $(MSIFILE) version=$(VERSION) 
-	"$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msm $(MSMFILE) version=$(VERSION) 
 	@echo [======== Building Solution $(SFILES) ========]
-	"$(VSINSTALLDIR)/devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log 
+	"$(VSINSTALLDIR)\devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log 
 	cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(CASABINDIR) 
-	cp -f $(TARGET_CFG)/Setup.* $(CASABINDIR) 
+	cp -f $(TARGET_CFG)/setup.* $(CASABINDIR) 
 	[ -d BUILT ] | mkdir -p BUILT
-	cp -p $(CASABINDIR)/Setup.* BUILT
+	cp -p $(CASABINDIR)/setup.* BUILT
 	cp -p $(CASABINDIR)/CASA.msi BUILT
 	tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT
 	bzip2 -z $(PACKAGE)-$(VERSION).tar
 
 	
 devenv:
-	@if ! test -x "$(VSINSTALLDIR)/devenv.exe";then echo "Error: MS Studio .NET is currently required to build MSI and MSM";exit 1;fi
+	@if ! test -x "$(VSINSTALLDIR)\devenv.exe";then echo "Error: MS Studio .NET is currently required to build MSI and MSM";exit 1;fi
  
 $(OBJDIR):
 	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
@@ -104,7 +103,7 @@ uninstall-local:
 
 clean-local:
 	@echo [======== Cleaning Solution $(SFILES) ========]
-	"$(VSINSTALLDIR)/devenv" /clean $(TARGET_CFG) $(SFILES) 
+	"$(VSINSTALLDIR)\devenv" /clean $(TARGET_CFG) $(SFILES) 
 	if [ -d $(TARGET_CFG) ]; then  rm -rf $(TARGET_CFG); fi
 	if [ -d Debug ]; then  rm -rf Debug; fi
 	if [ -f build.log ]; then  rm -f build.log; fi
diff --git a/CASA/readme-folder/readme-win.txt b/CASA/readme-folder/readme-win.txt
index ec310dc7..df62b3c4 100644
--- a/CASA/readme-folder/readme-win.txt
+++ b/CASA/readme-folder/readme-win.txt
@@ -1,7 +1,7 @@
 -----------------------------------------------------------------
 REQUIREMENTS FOR BUILDING THE SOFTWARE PACKAGE ON WINDOWS
 -----------------------------------------------------------------
-  - Install Visual Studio .NET 2003
+  - Install Visual Studio 2005
   - Install Cygwin
   - Install JAVA 1.5
   - Install GTK 2.6
@@ -90,16 +90,16 @@ Sample cygwin.bat:
 @echo off
 
 set JAVA_HOME=C:/Program Files/Java/jdk1.5.0_07
-set VSINSTALLDIR=C:/Program Files/Microsoft Visual Studio .NET 2003/Common7/IDE
-set MSC=C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7
+set VSINSTALLDIR=C:/Program Files/Microsoft Visual Studio 2005/Common7/IDE
+set MSC=C:/Program Files/Microsoft Visual Studio 2005/VC
 
 set PATH=%PATH%:/cygdrive/c/Program Files/Java/jdk1.5.0_07/bin
-set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7/bin
-set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Common7/IDE
+set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio 2005/VC/bin
+set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio 2005/Common7/IDE
 
 set INCLUDE=%INCLUDE%;c:\Program Files\Java\jdk1.5.0_07\include
 set INCLUDE=%INCLUDE%;c:\Program Files\Java\jdk1.5.0_07\include\win32
-set INCLUDE=%INCLUDE%;c:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\include
+set INCLUDE=%INCLUDE%;c:\Program Files\Microsoft Visual Studio 2005\VC\include
 
 C:
 chdir C:\cygwin\bin
diff --git a/CASA/tools/w32/VersionVDProj/MSIProjectVersioner.cs b/CASA/tools/w32/VersionVDProj/MSIProjectVersioner.cs
index 52a0474b..86df039c 100644
--- a/CASA/tools/w32/VersionVDProj/MSIProjectVersioner.cs
+++ b/CASA/tools/w32/VersionVDProj/MSIProjectVersioner.cs
@@ -37,7 +37,7 @@ namespace VersionVDProj
 	/// </summary>
 	public class MSIProjectVersioner : VDProjectVersioner
 	{
-		private readonly static Guid MSI_PROJECT_TYPE = new Guid( "{2C2AF0D9-9B47-4FE5-BEF2-169778172667}" );
+		private readonly static Guid MSI_PROJECT_TYPE = new Guid( "{978C614F-708E-4E1A-B201-565925725DBA}" );
 
 		private Guid productCode = Guid.Empty;
 		private Guid packageCode = Guid.Empty;
diff --git a/CASA/tools/w32/VersionVDProj/README b/CASA/tools/w32/VersionVDProj/README
index cc37127f..b4c63c7b 100644
--- a/CASA/tools/w32/VersionVDProj/README
+++ b/CASA/tools/w32/VersionVDProj/README
@@ -13,6 +13,9 @@ The copy right associated with this tool is as followings:
 // use however you'd like
 ////////////////////////////////////////////////////////////////
 
+
 4/14/2006
 
+10/18/2006  change MSI_PROJECT_TYPE to work with VS 2006
+
 
diff --git a/CASA/tools/w32/VersionVDProj/VersionVDProj.csproj b/CASA/tools/w32/VersionVDProj/VersionVDProj.csproj
new file mode 100644
index 00000000..4f848ea1
--- /dev/null
+++ b/CASA/tools/w32/VersionVDProj/VersionVDProj.csproj
@@ -0,0 +1,133 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{85DA1E26-3010-4CE8-A7F1-2ED180775C68}"
+        SccProjectName = "SAK"
+        SccLocalPath = "SAK"
+        SccAuxPath = "SAK"
+        SccProvider = "SAK"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = "App.ico"
+                AssemblyKeyContainerName = ""
+                AssemblyName = "VersionVDProj"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "VersionVDProj"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "App.ico"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "ArgumentParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "MSIProjectVersioner.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "MSMProjectVersioner.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "VDProjectVersioner.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Version.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/CASA/tools/w32/VersionVDProj/bin/VersionVDProj.exe b/CASA/tools/w32/VersionVDProj/bin/VersionVDProj.exe
index b0ca6153..a5233e57 100755
Binary files a/CASA/tools/w32/VersionVDProj/bin/VersionVDProj.exe and b/CASA/tools/w32/VersionVDProj/bin/VersionVDProj.exe differ