diff --git a/distrib/msw/makeall.bat b/distrib/msw/makeall.bat
index 7870a4adec..1b386c418d 100755
--- a/distrib/msw/makeall.bat
+++ b/distrib/msw/makeall.bat
@@ -36,6 +36,17 @@ if not direxist %BUILDDEST% mkdir /S %BUILDDEST%
 
 :dovc6
 
+cd %WXDIR%\samples
+erase /S *.exe
+cd %WXDIR%\demos
+erase /S *.exe
+cd %WXDIR%\contrib\samples
+erase /S *.exe
+cd %WXDIR%\utils\dialoged\src
+erase /S *.exe
+cd %WXDIR%\utils\tex2rtf\src
+erase /S *.exe
+
 echo Starting wxWindows build at %_TIME, %_DATE
 
 Rem First, VC++ 6.
@@ -77,14 +88,20 @@ cd %WXDIR%\samples
 nmake -f makefile.vc clean FINAL=1
 nmake -f makefile.vc FINAL=1
 Rem Copy all executables to VC6Release
-copy /S *.exe %BUILDDEST%\VC6Release
+Rem Euch, this is the only way I can think of right now
+Rem to copy them to the same directory. Daft but...
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
 nmake -f makefile.vc clean FINAL=1
 
 cd %WXDIR%\demos
 nmake -f makefile.vc clean FINAL=1
 nmake -f makefile.vc FINAL=1
 Rem Copy all executables to VC6Release
-copy /S *.exe %BUILDDEST%\VC6Release
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
 nmake -f makefile.vc clean FINAL=1
 
 Rem Compile OGL
@@ -204,14 +221,18 @@ cd %WXDIR%\samples
 make -f makefile.b32 clean FINAL=1
 make -f makefile.b32 FINAL=1
 Rem Copy all executables to BC55Release
-copy /S *.exe %BUILDDEST%\BC55Release
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
 make -f makefile.b32 clean FINAL=1
 
 cd %WXDIR%\demos
 make -f makefile.b32 clean FINAL=1
 make -f makefile.b32 FINAL=1
 Rem Copy all executables to BC55Release
-copy /S *.exe %BUILDDEST%\BC55Release
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
 make -f makefile.b32 clean FINAL=1
 
 Rem Compile OGL
@@ -332,14 +353,18 @@ cd %WXDIR%\samples
 make -f makefile.b32 clean FINAL=1
 make -f makefile.b32 FINAL=1
 Rem Copy all executables to BC50Release
-copy /S *.exe %BUILDDEST%\BC50Release
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\BC50Release
 make -f makefile.b32 clean FINAL=1
 
 cd %WXDIR%\demos
 make -f makefile.b32 clean FINAL=1
 make -f makefile.b32 FINAL=1
 Rem Copy all executables to BC50Release
-copy /S *.exe %BUILDDEST%\BC50Release
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\BC50Release
 make -f makefile.b32 clean FINAL=1
 
 Rem Compile OGL
@@ -446,14 +471,18 @@ cd %WXDIR%\samples
 make -f makefile.g95 clean FINAL=1
 make -f makefile.g95 FINAL=1
 Rem Copy all executables to Cygwin11Release
-copy /S *.exe %BUILDDEST%\Cygwin11Release
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
 make -f makefile.g95 clean FINAL=1
 
 cd %WXDIR%\demos
 make -f makefile.g95 clean FINAL=1
 make -f makefile.g95 FINAL=1
 Rem Copy all executables to Cygwin11Release
-copy /S *.exe %BUILDDEST%\Cygwin11Release
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
 make -f makefile.g95 clean FINAL=1
 
 Rem Compile OGL
@@ -522,14 +551,18 @@ cd %WXDIR%\samples
 make -f makefile.g95 clean FINAL=1
 make -f makefile.g95 FINAL=1
 Rem Copy all executables to Ming2952Release
-copy /S *.exe %BUILDDEST%\Ming2952Release
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
 make -f makefile.g95 clean FINAL=1
 
 cd %WXDIR%\demos
 make -f makefile.g95 clean FINAL=1
 make -f makefile.g95 FINAL=1
 Rem Copy all executables to Ming2952Release
-copy /S *.exe %BUILDDEST%\Ming2952Release
+erase %TEMP%\temp.zip
+zip16 -r %TEMP%\temp.zip *.exe
+unzip32 %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
 make -f makefile.g95 clean FINAL=1
 
 Rem Compile OGL
diff --git a/src/tiff/makefile.vc b/src/tiff/makefile.vc
index 5680063a25..99fddb17a5 100644
--- a/src/tiff/makefile.vc
+++ b/src/tiff/makefile.vc
@@ -1,46 +1,23 @@
 
 !if "$(FINAL)" == "1"
-LIBTARGET=$(WXDIR)\lib\tiff.lib
+LIBTARGET=..\..\lib\tiff.lib
 !else
-LIBTARGET=$(WXDIR)\lib\tiffd.lib
+LIBTARGET=..\..\lib\tiffd.lib
 !endif
 
-OBJECTS= \
-		tif_aux.obj \
-		tif_close.obj \
-		tif_codec.obj \
-		tif_compress.obj \
-		tif_dir.obj \
-		tif_dirinfo.obj \
-		tif_dirread.obj \
-		tif_dirwrite.obj \
-		tif_dumpmode.obj \
-		tif_error.obj \
-		tif_fax3.obj \
-		tif_fax3sm.obj \
-		tif_flush.obj \
-		tif_getimage.obj \
-		tif_jpeg.obj \
-		tif_luv.obj \
-		tif_lzw.obj \
-		tif_next.obj \
-		tif_open.obj \
-		tif_packbits.obj \
-		tif_pixarlog.obj \
-		tif_predict.obj \
-		tif_print.obj \
-		tif_read.obj \
-		tif_strip.obj \
-		tif_swab.obj \
-		tif_thunder.obj \
-		tif_tile.obj \
-		tif_version.obj \
-		tif_warning.obj \
-		tif_win32.obj \
-		tif_write.obj \
-		tif_zip.obj \
+OBJECTS= tif_aux.obj tif_close.obj tif_codec.obj tif_compress.obj tif_dir.obj tif_dirinfo.obj \
+		tif_dirread.obj tif_dirwrite.obj tif_dumpmode.obj tif_error.obj tif_fax3.obj \
+		tif_fax3sm.obj tif_flush.obj tif_getimage.obj tif_jpeg.obj tif_luv.obj tif_lzw.obj \
+		tif_next.obj tif_open.obj tif_packbits.obj tif_pixarlog.obj tif_predict.obj \
+		tif_print.obj tif_read.obj tif_strip.obj tif_swab.obj tif_thunder.obj tif_tile.obj \
+		tif_version.obj tif_warning.obj tif_win32.obj tif_write.obj tif_zip.obj
 
+defaulttarget:
+    echo Please use the 'all' target for this makefile.
 
+clean:
+    -erase $(LIBTARGET)
+    -erase *.obj
 
 # Pull in standard variable definitions