diff --git a/msvc/Makefile.msvc6 b/msvc/Makefile.msvc6
index 8f23a11d9..cf8331f78 100644
--- a/msvc/Makefile.msvc6
+++ b/msvc/Makefile.msvc6
@@ -117,7 +117,7 @@ lsp/config.lsp: $(srcdir)/lsp/config.lsp.in Makefile.msvc6
 	sed -e "s,@ecldir@,$(libdir:\=/),g" \
 	    -e "s,@SHORT_SITE_NAME@,$(SHORT_SITE_NAME),g" \
 	    -e "s,@LONG_SITE_NAME@,$(LONG_SITE_NAME),g" \
-	    -e "s,@ECL_VERSION@,$(ECL_VERSION),g" \
+	    -e "s,@PACKAGE_VERSION@,$(ECL_VERSION),g" \
 	    -e "s,@ARCHITECTURE@,$(ARCHITECTURE),g" \
 	    -e "s,@MACHINE_INSTANCE@,$(MACHINE_INSTANCE),g" \
 	    -e "s,@MACHINE_VERSION@,$(MACHINE),g" \
@@ -131,12 +131,16 @@ compile.lsp: bare.lsp $(srcdir)/compile.lsp.in Makefile.msvc6
 	    -e "s,@true_builddir@,$(MAKEDIR:\=/),g" \
 	    -e "s,@CFLAGS@,$(CFLAGS),g" \
 	    -e "s,@ECL_CFLAGS@,,g" \
+	    -e "s,@CPPFLAGS@,,g" \
 	    -e "s,@LDRPATH@,,g" \
 	    -e "s,@LDFLAGS@,/MD /link /LIBPATH:~S,g" \
 	    -e "s,@SHARED_LDFLAGS@,/LD,g" \
 	    -e "s,@BUNDLE_LDFLAGS@,/LD,g" \
 	    -e "s,@CLIBS@,user32.lib ws2_32.lib,g" \
 	    -e "s,@STATICLIBS@,eclgmp.lib eclgc.lib,g" \
+	    -e "s,@LIBS@,user32.lib ws2_32.lib,g" \
+	    -e "s,@CORE_LIBS@,,g" \
+	    -e "s,@FASL_LIBS@,,g" \
 	    -e "s,@OBJEXT@,obj,g" \
 	    -e "s,@SHAREDPREFIX@,,g" \
 	    -e "s,@SHAREDEXT@,lib,g" \
@@ -163,6 +167,7 @@ cmp/cmpcfg.lsp: $(srcdir)/cmp/cmpcfg.lsp.in Makefile.msvc6
 	sed -e "s,@ECL_CC@,$(CC),g" \
 	    -e "s,@CFLAGS@,$(CFLAGS),g" \
 	    -e "s,@ECL_CFLAGS@,,g" \
+	    -e "s,@CPPFLAGS@,,g" \
 	    -e "s,@LDRPATH@,,g" \
 	    -e "s,@LDFLAGS@,/MD /link /LIBPATH:~S,g" \
 	    -e "s,@SHARED_LDFLAGS@,/LD,g" \
diff --git a/msvc/ecl-threads.def b/msvc/ecl-threads.def
index 7ccf55319..ea36e99e9 100755
--- a/msvc/ecl-threads.def
+++ b/msvc/ecl-threads.def
@@ -1037,8 +1037,8 @@ EXPORTS
 	cl_gentemp
 	si_put_properties
 
-	cl_defvar
-	cl_defparameter
+	;cl_defvar
+	;cl_defparameter
 	make_symbol
 	make_keyword
 	symbol_value
diff --git a/msvc/ecl.def b/msvc/ecl.def
index aa13826ba..1f2a23e08 100644
--- a/msvc/ecl.def
+++ b/msvc/ecl.def
@@ -1037,8 +1037,8 @@ EXPORTS
 	cl_gentemp
 	si_put_properties
 
-	cl_defvar
-	cl_defparameter
+	;cl_defvar
+	;cl_defparameter
 	make_symbol
 	make_keyword
 	symbol_value