--- util/pl/VC-32.pl.orig	Mon Sep 19 09:45:20 2005
+++ util/pl/VC-32.pl	Sat Apr 29 15:25:39 2006
@@ -11,9 +11,8 @@
 
 # C compiler stuff
 $cc='cl';
-$cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
-$cflags.=' -D_CRT_SECURE_NO_DEPRECATE';	# shut up VC8
-$lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
+$cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Oy- /Gs0 /GF /Gy /Zi /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
+$lflags="/nologo /subsystem:console /machine:I386 /debug /incremental:no /opt:ref";
 $mlflags='';
 
 $out_def="out32";
@@ -23,11 +22,13 @@
 if ($debug)
 	{
 	$cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DOPENSSL_SYSNAME_WIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32";
-	$lflags.=" /debug";
+	$lflags=" /nologo /subsystem:console /machine:I386 /debug";
 	$mlflags.=' /debug';
 	}
 $cflags .= " -DOPENSSL_SYSNAME_WINNT" if $NT == 1;
 
+$cflags.=' /wd4996 -D_CRT_SECURE_NO_DEPRECATE -D_USE_32BIT_TIME_T';   # -really- shut up VC8
+
 $obj='.obj';
 $ofile="/Fo";
 
@@ -119,7 +120,10 @@
 		{
 		local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
 		$ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
-		$ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
+		$ret.="\t\$(LINK) \$(MLFLAGS) $efile\$@ /def:ms/${Name}.def @<<\n";
+		$ret.="\t\$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
+		$ret.="\tIF EXIST $@.manifest \\\n";
+		$ret.="\t  mt.exe -nologo -manifest \$@.manifest -outputresource:\$@;2\n";
 		}
 	$ret.="\n";
 	return($ret);
@@ -133,8 +137,10 @@
 	$file =~ s/\//$o/g if $o ne '/';
 	$n=&bname($targer);
 	$ret.="$target: $files $dep_libs\n";
-	$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n";
-	$ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
+	$ret.="\t\$(LINK) \$(LFLAGS) $efile\$@ @<<\n";
+	$ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n";
+	$ret.="\tIF EXIST $@.manifest \\\n";
+	$ret.="\t  mt.exe -nologo -manifest \$@.manifest -outputresource:\$@;1\n";
 	if (defined $sha1file)
 		{
 		$ret.="  $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
--- ms/do_masm.bat.orig	Tue May 11 07:46:09 2004
+++ ms/do_masm.bat	Sat Apr 29 15:31:03 2006
@@ -58,13 +58,13 @@
 echo on
 
 perl util\mkfiles.pl >MINFO
-rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak
-rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak
-perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak
-perl util\mk1mf.pl %1 VC-WIN32 >ms\nt.mak
-perl util\mk1mf.pl dll %1 VC-WIN32 >ms\ntdll.mak
+rem perl util\mk1mf.pl no-sock %* VC-MSDOS >ms\msdos.mak
+rem perl util\mk1mf.pl %* VC-W31-32 >ms\w31.mak
+perl util\mk1mf.pl dll %* VC-W31-32 >ms\w31dll.mak
+perl util\mk1mf.pl %* VC-WIN32 >ms\nt.mak
+perl util\mk1mf.pl dll %* VC-WIN32 >ms\ntdll.mak
 
-perl util\mkdef.pl 16 libeay %1 > ms\libeay16.def
-perl util\mkdef.pl 32 libeay %1 > ms\libeay32.def
-perl util\mkdef.pl 16 ssleay %1 > ms\ssleay16.def
-perl util\mkdef.pl 32 ssleay %1 > ms\ssleay32.def
+perl util\mkdef.pl 16 libeay %* > ms\libeay16.def
+perl util\mkdef.pl 32 libeay %* > ms\libeay32.def
+perl util\mkdef.pl 16 ssleay %* > ms\ssleay16.def
+perl util\mkdef.pl 32 ssleay %* > ms\ssleay32.def