diff --git a/CASA/configure.in b/CASA/configure.in
index e2eb47cf..22edba6f 100644
--- a/CASA/configure.in
+++ b/CASA/configure.in
@@ -331,6 +331,7 @@ package/linux/Makefile
 package/windows/Makefile
 package/windows/vs_solutions/Makefile
 package/windows/vs_solutions/CASA32-msi/Makefile
+package/windows/vs_solutions/CASA64-msi/Makefile
 package/linux/CASA.spec
 ])
 
diff --git a/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am b/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
index c72a8805..62734fee 100644
--- a/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
+++ b/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
@@ -19,21 +19,97 @@
 #
 #######################################################################
 
-if LIB64
-SUBDIR = CASA64-msi
+if DEBUG
+TARGET_CFG = Debug
+CFLAGS += -v -w 
 else
-SUBDIR = CASA32-msi
+TARGET_CFG = Release
 endif
 
-DIST_SUBDIRS = CASA32-msi CASA64-msi
+SUBDIRS =
+DIST_SUBDIRS =
 
-CFILES =
+EXTRA_DIST = $(SFILES)  
 
-EXTRA_DIST = 
+CASAROOT = ../../../..
 
-.PHONY: package package-clean package-install package-uninstall
-package package-clean package-install package-uninstall:
-	$(MAKE) -C $(TARGET_OS) $@
+CASALIBDIR = $(CASAROOT)/lib
+
+if LIB64
+CASABINDIR = $(CASAROOT)/bin64
+else
+CASABINDIR = $(CASAROOT)/bin
+endif
+
+# handle Mono secondary dependencies
+export MONO_PATH := $(MONO_PATH)
+
+PLATFORMINDEPENDENTSOURCEDIR = .. 
+PLATFORMDEPENDENTSOURCEDIR = .
+
+MODULE_NAME =CASA
+MODULE_EXT =msi
+
+SFILES = CASA-64-32.sln 
+MSMFILE = ../CASA-msm/CASA-msm.vdproj
+MSIFILE = CASA64.vdproj
+
+CUR_DIR := $(shell pwd)
+
+all: $(MODULE_NAME).$(MODULE_EXT)
+
+#
+# Pattern based rules.
+#
+vpath %.c $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR)
+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) 
+	@echo [======== Building Solution $(SFILES) ========]
+	"$(VSINSTALLDIR)\devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log 
+	cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(CASABINDIR) 
+	cp -f $(TARGET_CFG)/setup.* $(CASABINDIR) 
+	[ -d BUILT ] | mkdir -p 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
+ 
+$(OBJDIR):
+	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
+	[ -d $(CASABINDIR) ] || mkdir -p $(CASABINDIR)
+
+
+install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	$(INSTALL_PROGRAM) $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(DESTDIR)$(libdir)/
+
+uninstall-local:
+	cd $(DESTDIR)$(libdir); rm -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
+	rmdir $(DESTDIR)$(libdir)
+
+#installcheck-local: install
+#	$(mkinstalldirs) $(DESTDIR)$(libdir)
+#	$(INSTALL_PROGRAM) $(DESTDIR)$(libdir)
+#	cd $(DESTDIR)$(libdir); $(MONO)
+
+clean-local:
+	@echo [======== Cleaning Solution $(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
+	if [ -d BUILT ]; then rm -rf BUILT; fi
+	if [ -f $(PACKAGE)-$(VERSION).tar.bz2 ]; then rm -f $(PACKAGE)-$(VERSION).tar.bz2; fi
+distclean-local:
 
 maintainer-clean-local:
 	rm -f Makefile.in
diff --git a/CASA/package/windows/vs_solutions/Makefile.am b/CASA/package/windows/vs_solutions/Makefile.am
index abaf1374..2f2893c1 100755
--- a/CASA/package/windows/vs_solutions/Makefile.am
+++ b/CASA/package/windows/vs_solutions/Makefile.am
@@ -19,9 +19,14 @@
 #
 #######################################################################
 
+if LIB64
+SUBDIRS = CASA64-msi
+DIST_SUBDIRS = CASA64-msi
+else
 SUBDIRS = CASA32-msi
+DIST_SUBDIRS = CASA32-msi 
+endif
 
-DIST_SUBDIRS = CASA32-msi
 
 CFILES =