Index: win/makefile.vc
===================================================================
diff -u -rdbddf1307f95cf05c848bab95ff3cc0766153203 -rd5e628d276c489577f643c252fb549dcb43cb64d
--- win/makefile.vc	(.../makefile.vc)	(revision dbddf1307f95cf05c848bab95ff3cc0766153203)
+++ win/makefile.vc	(.../makefile.vc)	(revision d5e628d276c489577f643c252fb549dcb43cb64d)
@@ -232,16 +232,14 @@
 	$(ROOT)\tests\protected.test \
 	$(ROOT)\tests\parameters.test \
 	$(ROOT)\tests\plain-object-method.test \
-	$(ROOT)\tests\class-method.test
+	$(ROOT)\tests\class-method.test \
+	$(ROOT)\tests\nsf-cmd.test \
+	$(ROOT)\tests\accessor.test \
+	$(ROOT)\tests\linearization.test \
+	$(ROOT)\tests\traits.test
 
 PRJHEADERS =
 
-NXLIBS = \
-	$(LIBDIR)\nx \
-	$(LIBDIR)\serialize \
-	$(LIBDIR)\xotcl \
-	$(LIBDIR)\lib	
-
 #-------------------------------------------------------------------------
 # Target names and paths ( shouldn't need changing )
 #-------------------------------------------------------------------------
@@ -498,9 +496,9 @@
 	@echo package ifneeded $(PROJECT) $(DOTVERSION) \
 	    [list load [file join $$dir $(PRJLIBNAME)] $(PROJECT)] > $@
 
-	@for /d %d in ($(LIBDIR)\*) in do \
+	@for /d %d in ($(LIBDIR)\*) do \
 		pushd %d &\
-		$(TCLSH) $(LIBDIR)\lib\mkIndex.tcl -dir $(LIBDIR) &\
+		$(TCLSH) $(MAKEDIR)\$(LIBDIR)\lib\mkIndex.tcl -dir $(MAKEDIR)\$(LIBDIR) &\
 		popd
 
 #---------------------------------------------------------------------
Index: win/pkg.vc
===================================================================
diff -u -reb758924a74f48512c98a40a539ab0c4e5a35de9 -rd5e628d276c489577f643c252fb549dcb43cb64d
--- win/pkg.vc	(.../pkg.vc)	(revision eb758924a74f48512c98a40a539ab0c4e5a35de9)
+++ win/pkg.vc	(.../pkg.vc)	(revision d5e628d276c489577f643c252fb549dcb43cb64d)
@@ -3,4 +3,4 @@
 
 PACKAGE_MAJOR	= 2
 PACKAGE_MINOR	= 0
-PACKAGE_VERSION	= "2.0b6"
+PACKAGE_VERSION	= "2.0.0"